OSDN Git Service

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


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