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