tree 7e4ba5f7ca33c6cf4fb20243fd84333e9ff88cbd
parent cccd8ec0d693581659b56fad9a93af9df8059afb
parent 655ec49116ccb481fcd0053827029f01b4ea81bc
author sharada <sharadax.palasamudram.ashok.kumar@intel.com> 1391638061 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1391638061 -0800

am 655ec491: am 2e452ccf: am a0b1c0f9: Cherry-pick: Use getAssetUrl() to access files present in assets folder from master.

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