OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0370a03 1d94a1d)
DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours am: dbc9a47831...
authorNick Kralevich <nnk@google.com>
Fri, 23 Oct 2015 04:36:16 +0000 (04:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Oct 2015 04:36:16 +0000 (04:36 +0000)
am: 1d94a1d036  -s ours

* commit '1d94a1d036cb4bc8d9b178f56fa3bbddc81b7f10':
  DO NOT MERGE: fix build try #2


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