OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 626ed73 9f3426a)
am 9f3426a8: am d065fd41: (-s ours) am 204b4157: am f8a6a2f6: Merge "Use _WIN32 rathe...
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 19:01:49 +0000 (19:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 19:01:49 +0000 (19:01 +0000)
* commit '9f3426a83db9aea16fd90e7c531a87d55ed7b81b':


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