OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d051667 95e42d9)
resolve merge conflicts of 95e42d9 to nyc-dev-plus-aosp
authorDavid Gross <dgross@google.com>
Thu, 21 Jul 2016 21:06:20 +0000 (14:06 -0700)
committerDavid Gross <dgross@google.com>
Thu, 21 Jul 2016 21:06:20 +0000 (14:06 -0700)
Change-Id: Iaa22f6c36676974223919918657f5d04d94e482e


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