summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/id3
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2013-06-13 10:43:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-13 10:43:49 -0700
commit04411d3ed343added179703837c6c24444acce3b (patch)
tree35ee8d5a224ee9ffff2e69238666535beb254aa7 /media/libstagefright/id3
parent2b5f8f451d5459b17a7a99637f99a950fd74cc96 (diff)
parentccc366a90fdd8d9df5de27820f04bc534d122c07 (diff)
downloadframeworks_av-04411d3ed343added179703837c6c24444acce3b.zip
frameworks_av-04411d3ed343added179703837c6c24444acce3b.tar.gz
frameworks_av-04411d3ed343added179703837c6c24444acce3b.tar.bz2
am ccc366a9: am 1191454a: Merge "Camera3: Skipping no-ops good, not updating state machine bad." into jb-mr2-dev
* commit 'ccc366a90fdd8d9df5de27820f04bc534d122c07': Camera3: Skipping no-ops good, not updating state machine bad.
Diffstat (limited to 'media/libstagefright/id3')
0 files changed, 0 insertions, 0 deletions