OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c53526 84f479f)
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c
authorfionaxu <fionaxu@google.com>
Wed, 8 Jun 2016 02:04:12 +0000 (02:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Jun 2016 02:04:12 +0000 (02:04 +0000)
am: 84f479f6b5  -s ours

Change-Id: Ia2605d430a9f3fdc1de6a59bb5702f4f65ae3816


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