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:
b2b56d1
9f7ef49
)
Merge \\\\"DO NOT MERGE - SoftMP3: memset safely\\\\" into lmp-dev am: d5573715d8...
author
Robert Shih
<robertshih@google.com>
Thu, 14 Jul 2016 18:19:58 +0000
(18:19 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 14 Jul 2016 18:19:58 +0000
(18:19 +0000)
am:
9f7ef49df4
-s ours
Change-Id: If5670ac1cde5b28e1993344176682e6479932aa5
Trivial merge