tree 0e84e37b0e99fe695c25de0781a425a6975b3055
parent 97de064a9a01d2481c47767d7fbb5b7d5482a3aa
parent aa98fb51a8a0148b72e1662cc42102c6547776ce
author Narayan Kamath <narayan@google.com> 1392232976 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392232976 +0000

am aa98fb51: am f991771f: Merge "Use size_t* in AssetManager::createIdmap"

* commit 'aa98fb51a8a0148b72e1662cc42102c6547776ce':
  Use size_t* in AssetManager::createIdmap