OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55144e0 0db75fe)
am 6239ed0c: am fbb2246c: am 92486999: Allow for appending of resources to an AssetMa...
authorMartin Kosiba <mkosiba@google.com>
Thu, 17 Jul 2014 21:04:53 +0000 (21:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Jul 2014 21:04:53 +0000 (21:04 +0000)
* commit '6239ed0c67b2e981e80e9eac29d9aecd01a99cda':
  Allow for appending of resources to an AssetManager.


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