OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 305c61a 271b28a)
am 271b28ac: am 80213160: am ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."
authorNarayan Kamath <narayan@google.com>
Tue, 14 Jan 2014 09:54:33 +0000 (09:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jan 2014 09:54:33 +0000 (09:54 +0000)
* commit '271b28ac3121e8bcc46e15bd15b13bfbc1e1be89':
  Hide AssetInputStream.getAssetInt.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help