tree e1fea556c26e32eec3409a13e0cff48a537771b0
parent 9e39a2d6954c5ce6c37e1b024befde0099a87ebd
parent e55bf0a0ccc930b765ab9b85509ebf6143c4d0dc
author sharada <sharadax.palasamudram.ashok.kumar@intel.com> 1391639692 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391639692 +0000

am e55bf0a0: am 1ebc592c: am 19da3f7c: am b792d3c6: am 934180d9: am 2739fb79: am 678dc41d: am 655ec491: am 2e452ccf: am a0b1c0f9: Cherry-pick: Use getAssetUrl() to access files present in assets folder from master.

* commit 'e55bf0a0ccc930b765ab9b85509ebf6143c4d0dc':
  Cherry-pick: Use getAssetUrl() to access files present in assets folder from master.