OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7bfa5a9 e4c060b)
am e4c060bb: am ef23eb24: (-s ours) am beda6e2b: Merge "Revert "Add a (hidden) mappin...
authorPaul Mclean <pmclean@google.com>
Thu, 27 Aug 2015 19:42:20 +0000 (19:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 19:42:20 +0000 (19:42 +0000)
* commit 'e4c060bbbc40d6eedbb93102c2dc79187c9b5396':


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