summaryrefslogtreecommitdiffstats
path: root/drm/mediadrm
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2014-11-06 23:57:09 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-11-06 23:57:09 +0000
commit5cccfce1d9f1d088a9c363a45e0affc4474c4716 (patch)
treede24fd38277b8d4f3ee954fe4156798f34a045a3 /drm/mediadrm
parente0e8223c10e051b73fdcbed4fc67a69df2655c56 (diff)
parente86c6d59dfa8aea8f321287cbb1f122623e5417a (diff)
downloadframeworks_av-5cccfce1d9f1d088a9c363a45e0affc4474c4716.zip
frameworks_av-5cccfce1d9f1d088a9c363a45e0affc4474c4716.tar.gz
frameworks_av-5cccfce1d9f1d088a9c363a45e0affc4474c4716.tar.bz2
Merge "AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek." into lmp-mr1-dev
automerge: e86c6d5 * commit 'e86c6d59dfa8aea8f321287cbb1f122623e5417a': AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek.
Diffstat (limited to 'drm/mediadrm')
0 files changed, 0 insertions, 0 deletions