tree cae82eb62ed5e65b74eb1cc8870b5007d9864571
parent 06b1ae2945397fd99e14a3cee0cbfbdf303d445b
parent 419c7f541114b5a78355fd77f31c54aca6a7cc3b
author Yin-Chia Yeh <yinchiayeh@google.com> 1414576435 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414576435 +0000

am 419c7f54: am f00ed2ca: am 9615995d: Camera2 ITS: add proper capability gating

* commit '419c7f541114b5a78355fd77f31c54aca6a7cc3b':