OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0837e3e c4ae782)
resolve merge conflicts of c4ae782 to nyc-dev-plus-aosp
authorDirk Dougherty <ddougherty@google.com>
Mon, 25 Jul 2016 20:47:53 +0000 (13:47 -0700)
committerDirk Dougherty <ddougherty@google.com>
Mon, 25 Jul 2016 20:47:53 +0000 (13:47 -0700)
Change-Id: Ib81e71e0b9a17a4231d93f02f41c7722fad84ec3


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