commit | 9eed8f9a5edf1338d0a36bb486dfd44d39cd9fa4 | [log] [tgz] |
---|---|---|
author | Rachad <rachad@google.com> | Sat Jan 10 01:37:29 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 10 01:37:29 2015 +0000 |
tree | 97f560ce9b178866295036b1d9dd03f366de9a4a | |
parent | 1bc109b9280113e44b7b48b355397a630d0862e7 [diff] | |
parent | 2a7991ee2f331c242ff9f7b87058e64b50a616fd [diff] |
am 2a7991ee: am 6d3cff12: Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev automerge: b60bb35 * commit '2a7991ee2f331c242ff9f7b87058e64b50a616fd': MediaCodec: Added E-AC3 mime type (@hide).