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:
6f16bd8
cf1aed6
)
Merge \\\\"DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer\\\\" into klp...
author
Marco Nelissen
<marcone@google.com>
Fri, 10 Jun 2016 23:23:40 +0000
(23:23 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 10 Jun 2016 23:23:40 +0000
(23:23 +0000)
am:
cf1aed6258
-s ours
Change-Id: I2e1d024a8753071da5dbe098ea67de782ec44488
Trivial merge