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