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:
1f3ca0c
354393e
)
DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours am: dbc9a47831...
author
Nick Kralevich
<nnk@google.com>
Fri, 23 Oct 2015 21:59:06 +0000
(21:59 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 23 Oct 2015 21:59:06 +0000
(21:59 +0000)
am:
354393ef75
-s ours
* commit '
354393ef75cdd25864f4d22ebba0c14163aedae4
':
DO NOT MERGE: fix build try #2
Trivial merge