tree e82cf7c0326acff63ff2e792c7da6537d7accb5f
parent cce8e8a5c765c13c3578bf1b9c2106c5daa104ff
parent d34950cfc66e258caba14c7ddc553028647898f1
author Narayan Kamath <narayan@google.com> 1389695024 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389695024 +0000

am d34950cf: am 80b0496a: am 2db26788: am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""

* commit 'd34950cfc66e258caba14c7ddc553028647898f1':
  Revert "Hide AssetInputStream.getAssetInt."