tree d9c7cbc94e2c49e4740a31e05ceca5c7f6c57498
parent 7c3e03cfe869b19b9fc566d65a980a6761229d35
parent 5968350855ea7534aa13cbafa3c8004918407130
author Ying Wang <wangying@google.com> 1395168617 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395168617 +0000

am 59683508: am 5462f7f9: am 255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES."

* commit '5968350855ea7534aa13cbafa3c8004918407130':
  Remove unused LOCAL_ASSET_FILES.