OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8f22b8 10730b6)
am 10730b69: (-s ours) am e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev
authorAdam Lesinski <adamlesinski@google.com>
Thu, 27 Aug 2015 09:39:40 +0000 (09:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 09:39:40 +0000 (09:39 +0000)
* commit '10730b690732e3301048a0a564c3e5b42f28995d':


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