tree 080eec26149b85226afe334670123028a56db6f3
parent 305c61a1c6816549b225719518df5b29a17f0f42
parent 271b28ac3121e8bcc46e15bd15b13bfbc1e1be89
author Narayan Kamath <narayan@google.com> 1389693273 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389693273 +0000

am 271b28ac: am 80213160: am ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."

* commit '271b28ac3121e8bcc46e15bd15b13bfbc1e1be89':
  Hide AssetInputStream.getAssetInt.