OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 005a84c 3481659)
resolve merge conflicts of 3481659 to nyc-dev
authorDirk Dougherty <ddougherty@google.com>
Tue, 3 May 2016 04:03:13 +0000 (21:03 -0700)
committerDirk Dougherty <ddougherty@google.com>
Tue, 3 May 2016 04:03:13 +0000 (21:03 -0700)
Change-Id: Iea83aebfd5e8a7fa0dcb0c459588048d0f7ce47e


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