tree 9dd5bbc5611385e78fdf667ba71706560fcaa698
parent fe32785b615c319a245cf9b5b02141b0c45b1a2b
parent 2e452ccf1d1369bc2cfa629834d306cd2b3b1fae
author sharada <sharadax.palasamudram.ashok.kumar@intel.com> 1391637854 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1391637854 -0800

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

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