OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
25a681e
1b3f61c
)
DO NOT MERGE Fix divide by zero am: febbd52cd9 am: 55ce7e5d1e
author
Marco Nelissen
<marcone@google.com>
Thu, 13 Oct 2016 23:30:16 +0000
(23:30 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 13 Oct 2016 23:30:16 +0000
(23:30 +0000)
am:
1b3f61ceaf
-s ours
Change-Id: Iaf8f9526bbb01eca75ded491f2dd43baabaee22e
Trivial merge