tree 69c005b62daf243fedebd761d35cbc7a00a57d5d
parent c4878899ddf78ebc78125b0c4a9544a2476ea738
parent 1ebc592c3e1fb9ef82d6712a4ea0a5692dd0084d
author sharada <sharadax.palasamudram.ashok.kumar@intel.com> 1391639547 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391639547 +0000

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 '1ebc592c3e1fb9ef82d6712a4ea0a5692dd0084d':
  Cherry-pick: Use getAssetUrl() to access files present in assets folder from master.