OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b771ef 17b4be0)
am 17b4be07: (-s ours) am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from...
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 10:21:01 +0000 (10:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:21:01 +0000 (10:21 +0000)
* commit '17b4be07fed91da2f770be87f66b1e8918dff52f':


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