OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd9aad3 6eac97d)
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6a...
authorNick Kralevich <nnk@google.com>
Fri, 23 Oct 2015 04:26:07 +0000 (04:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Oct 2015 04:26:07 +0000 (04:26 +0000)
am: 6eac97d4ba

* commit '6eac97d4baf77954c7d862e7bf35ed3763543491':
  DO NOT MERGE: fix build breakage


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