OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7e6930 aa4a994)
am aa4a994d: (-s ours) am 4d4c4507: am 220b61f1: Merge "frameworks/base: libexpat...
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 07:06:44 +0000 (07:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 07:06:44 +0000 (07:06 +0000)
* commit 'aa4a994d5c6e136752b41964d655ff610b345cd0':


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