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:
20ae503
d557371
)
Merge \"DO NOT MERGE - SoftMP3: memset safely\" into lmp-dev
author
Robert Shih
<robertshih@google.com>
Thu, 14 Jul 2016 18:09:23 +0000
(18:09 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 14 Jul 2016 18:09:23 +0000
(18:09 +0000)
am:
d5573715d8
-s ours
Change-Id: I8f7f2b98145c76b2904a0ef57651214e6881aac5
Trivial merge