OSDN Git Service

am ec70f809: am d34950cf: am 80b0496a: am 2db26788: am e71afc2e: Merge "Revert "Hide...
authorNarayan Kamath <narayan@google.com>
Tue, 14 Jan 2014 10:26:18 +0000 (10:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jan 2014 10:26:18 +0000 (10:26 +0000)
commit3a248a14938cc723942e68fc06ed2589efb53a4b
treeb73b7e8a64cba5b1a12f54bb0031bfb307f97cff
parentbc448267eae8397553a7cb4eee065c0e56885559
parentec70f8091185cd68afd4fcda42b513111eae70e4
am ec70f809: am d34950cf: am 80b0496a: am 2db26788: am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""

* commit 'ec70f8091185cd68afd4fcda42b513111eae70e4':
  Revert "Hide AssetInputStream.getAssetInt."
api/current.txt
core/java/android/content/res/AssetManager.java