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:
9c6eda2
4c31eb2
)
Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a30
author
Marco Nelissen
<marcone@google.com>
Sat, 15 Oct 2016 02:05:19 +0000
(
02:05
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Sat, 15 Oct 2016 02:05:19 +0000
(
02:05
+0000)
am:
4c31eb2675
-s ours
Change-Id: Ibc0f32ba1c4701f8c30f82b5b6c281ded3c628c7
Trivial merge