summaryrefslogtreecommitdiffstats
path: root/media/jni/android_media_MediaCodec.cpp
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2015-04-29 19:42:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-29 19:42:49 +0000
commite58e0e50efa429b47985acedf3ec7d8d5745ea95 (patch)
tree50976f08e83d5d498ff948d36b0540ac682d322d /media/jni/android_media_MediaCodec.cpp
parent2c160c1a64a696dcb6261311ca0a406a07231d33 (diff)
parent737f0b22bec07297eea782ea2cb29b056e849efc (diff)
downloadframeworks_base-e58e0e50efa429b47985acedf3ec7d8d5745ea95.zip
frameworks_base-e58e0e50efa429b47985acedf3ec7d8d5745ea95.tar.gz
frameworks_base-e58e0e50efa429b47985acedf3ec7d8d5745ea95.tar.bz2
am 737f0b22: am 7201bf2b: Merge "Unify View alpha implies clipping behavior" into mnc-dev
* commit '737f0b22bec07297eea782ea2cb29b056e849efc': Unify View alpha implies clipping behavior
Diffstat (limited to 'media/jni/android_media_MediaCodec.cpp')
0 files changed, 0 insertions, 0 deletions