summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2014-06-23 20:59:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-23 20:59:00 +0000
commit448de94ac0bfd8cf3d36939a01c3e17655e9a207 (patch)
treebb1dc307c2e50e5df94e485cd50018c5c2ffe663
parent047d53672d4fcfe5d480a170b6b1518e89c4038d (diff)
parentd9962b0cedef65c96b74d2981814adfb46ebfff3 (diff)
downloadandroid_frameworks_ex-448de94ac0bfd8cf3d36939a01c3e17655e9a207.tar.gz
android_frameworks_ex-448de94ac0bfd8cf3d36939a01c3e17655e9a207.tar.bz2
android_frameworks_ex-448de94ac0bfd8cf3d36939a01c3e17655e9a207.zip
am d9962b0c: am 6a005419: Merge "camera2: BlockingStateListener invokes proxy before firing state change"
* commit 'd9962b0cedef65c96b74d2981814adfb46ebfff3':
0 files changed, 0 insertions, 0 deletions