OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92234c5 d45e51b)
Merge changes I2ce11db5,Idba8278b am: dd3f863499 am: 198134666b
authorColin Cross <ccross@android.com>
Tue, 4 Oct 2016 21:23:07 +0000 (21:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Oct 2016 21:23:07 +0000 (21:23 +0000)
am: d45e51b815  -s ours

Change-Id: I4f7e6dbcd4a1ab14ed0c6e7cb056a6a94175831e


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