OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1e9e81 878acad)
am 878acada: am d7792759: am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that...
authorDavid Friedman <dmail@google.com>
Tue, 18 Aug 2015 05:14:12 +0000 (05:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Aug 2015 05:14:12 +0000 (05:14 +0000)
* commit '878acada08c49214b720fdd57b8150407a4e223f':
  Docs: Fixing files that didn't merge properly from mnc-preview-docs


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