OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e3ed795 5819755)
resolve merge conflicts of d04c51ea372a to nyc-mr2-dev-plus-aosp
authorTyler Gunn <tgunn@google.com>
Fri, 3 Feb 2017 21:57:09 +0000 (21:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 21:57:09 +0000 (21:57 +0000)
am: 5819755163  -s ours

Change-Id: I2cdccaa724f76b3b1aaacd328984284709b5d166


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