OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d27e2d 6ec78a6)
Merge \"resolve merge conflicts of ac5b340 to nyc-dev\" into nyc-dev
authorDaniel Yu <dsyu@google.com>
Tue, 28 Jun 2016 16:28:34 +0000 (16:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Jun 2016 16:28:34 +0000 (16:28 +0000)
am: 6ec78a6458

Change-Id: I8c631533ad43598475938bc1e3f9f0f171511c0a


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