OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21b5895 6cef7f9)
am 6cef7f95: am ef552875: (-s ours) am 13c25290: am e7fb3318: am b50a279f: Merge...
authorDavid Friedman <dmail@google.com>
Thu, 27 Aug 2015 15:05:41 +0000 (15:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 15:05:41 +0000 (15:05 +0000)
* commit '6cef7f95d7cd6e11d0166069d93ebbf367ca35dc':


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