OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fa632f6
034bc17
)
DO NOT MERGE: fix build try #2 am: 778b6f4902
author
Nick Kralevich
<nnk@google.com>
Fri, 23 Oct 2015 04:19:51 +0000
(
04:19
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 23 Oct 2015 04:19:51 +0000
(
04:19
+0000)
am:
034bc1799c
-s ours
* commit '
034bc1799cbbc4184aa507eba181573c0a3b9b35
':
DO NOT MERGE: fix build try #2
Trivial merge