OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
44da75e
8b1eed4
)
Merge "Revert "Remove AmrInputStream"" am: e2d8581529 am: 01cb199bed
author
Marco Nelissen
<marcone@google.com>
Wed, 14 Dec 2016 17:12:59 +0000
(17:12 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 14 Dec 2016 17:12:59 +0000
(17:12 +0000)
am:
8b1eed4ee8
Change-Id: Iab40a083d9d0d2c9d4359be25e88d25f8fdc12aa
Trivial merge