OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6f8a10b 0d00d28)
resolve merge conflicts of 0d00d28 to nyc-dev
authorDirk Dougherty <ddougherty@google.com>
Wed, 27 Apr 2016 06:54:24 +0000 (23:54 -0700)
committerDirk Dougherty <ddougherty@google.com>
Wed, 27 Apr 2016 17:44:43 +0000 (10:44 -0700)
Change-Id: Ib922635fe200a4216ce2970660daf3105d521cc9

1  2 
Android.mk patch | diff1 | diff2 | blob | history

diff --cc Android.mk
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help