diff options
author | Wei Jia <wjia@google.com> | 2014-11-14 19:16:26 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-14 19:16:26 +0000 |
commit | a16bb9e84c5e824175fdfb5c5778d1b7bf3201fe (patch) | |
tree | 3fbf72bf93a82c2f2bdc9444f752258f0bd033e6 /include/media | |
parent | 9b58c14a4988cf56b9b9a85da60e3c7297e6ef31 (diff) | |
parent | 3c17893c75bfa050c4e422cff417c428d74429e7 (diff) | |
download | frameworks_av-a16bb9e84c5e824175fdfb5c5778d1b7bf3201fe.zip frameworks_av-a16bb9e84c5e824175fdfb5c5778d1b7bf3201fe.tar.gz frameworks_av-a16bb9e84c5e824175fdfb5c5778d1b7bf3201fe.tar.bz2 |
am 3c17893c: am 285dc585: am 12acd3f0: Merge "AnotherPacketSource: need reset some members before returning from queueDiscontinuity()." into lmp-mr1-dev
* commit '3c17893c75bfa050c4e422cff417c428d74429e7':
AnotherPacketSource: need reset some members before returning from queueDiscontinuity().
Diffstat (limited to 'include/media')
0 files changed, 0 insertions, 0 deletions