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:
9112c16
10cb330
)
Merge "Revert "Remove AmrInputStream"" am: e2d8581529 am: 01cb199bed am: 8b1eed4ee8
author
Marco Nelissen
<marcone@google.com>
Wed, 14 Dec 2016 17:19:46 +0000
(17:19 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 14 Dec 2016 17:19:46 +0000
(17:19 +0000)
am:
10cb330d3e
Change-Id: I5c97e47ff9a5f193645660c195ddd707b86ad025
Trivial merge