tree bb1dc307c2e50e5df94e485cd50018c5c2ffe663
parent 047d53672d4fcfe5d480a170b6b1518e89c4038d
parent d9962b0cedef65c96b74d2981814adfb46ebfff3
author Igor Murashkin <iam@google.com> 1403557140 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403557140 +0000

am d9962b0c: am 6a005419: Merge "camera2: BlockingStateListener invokes proxy before firing state change"

* commit 'd9962b0cedef65c96b74d2981814adfb46ebfff3':