Commit 82f9e87b authored by Primiano Tucci's avatar Primiano Tucci Committed by Android Git Automerger
Browse files

am 1f9a5394: (-s ours) am 976bad56: Merge "Cherry-pick: Use getAssetUrl() to... 

am 1f9a5394: (-s ours) am 976bad56: Merge "Cherry-pick: Use getAssetUrl() to access files present in assets folder from master. DO NOT MERGE" into klp-dev

* commit '1f9a5394':
  Cherry-pick: Use getAssetUrl() to access files present in assets folder from master. DO NOT MERGE
parents 28f8bc8c 1f9a5394
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment