OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf88bbc 3ed2a4e)
am 3ed2a4e1: (-s ours) am eee09f49: Merge "cherrypick from mnc-preview-docs docs...
authorAndrew Solovay <asolovay@google.com>
Thu, 27 Aug 2015 10:25:52 +0000 (10:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:25:52 +0000 (10:25 +0000)
* commit '3ed2a4e169cb5d676e768015216bf7f98db37e2f':


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