OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0fd07c4 a544221)
resolve merge conflicts of a544221 to nyc-dev-plus-aosp
authorHemal Patel <hemalp@google.com>
Thu, 25 Aug 2016 23:53:49 +0000 (16:53 -0700)
committerHemal Patel <hemalp@google.com>
Fri, 26 Aug 2016 00:30:34 +0000 (17:30 -0700)
Change-Id: Ie7a3a85fdd2e59eea4f74760010190ce9f5f9b02


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