tree 7f7e31c000c122338b27efc695fe71f5b3cd454c
parent 405a672bd125615c5b7177ecb1d8d23dffa8cdc2
parent ca0a4a543ca13501132945a6e1c2ab349a0c77de
author Eino-Ville Talvala <etalvala@google.com> 1403552486 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403552486 +0000

am ca0a4a54: am 76978a04: am 6102db91: am 08f250d9: Revert "Camera2: Use hidden APIs"

* commit 'ca0a4a543ca13501132945a6e1c2ab349a0c77de':