tree 4f387bed6a23432dddf214bf089a4b847ee1eacc
parent edd15f39f57306ac1ca54fd50640f45eccf7d3e0
parent 61234deafe78ded05569edfab24536cdb4bd7720
author Yusuke Sato <yusukes@google.com> 1438825224 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438825224 +0000

am 61234dea: am bd4c482b: Merge "Clean up AssetManager::scanAndMergeZipLocked"

* commit '61234deafe78ded05569edfab24536cdb4bd7720':
  Clean up AssetManager::scanAndMergeZipLocked