OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 633f08b 27de3fc)
resolve merge conflicts of de591df to nyc-mr2-dev-plus-aosp
authorNaveen Kalla <mrnaveen@google.com>
Fri, 28 Oct 2016 23:16:34 +0000 (23:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 28 Oct 2016 23:16:34 +0000 (23:16 +0000)
am: 27de3fc0a1  -s ours

Change-Id: I6184d22117a81ba5a7b0a8b18108eb9f178d08f9


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