tree b3b5c36a167e4d77bbbd612e9f2a90cb287fcd60
parent 20d73db4db7be0586e3127f618f93ecc72639ecc
parent 405a672bd125615c5b7177ecb1d8d23dffa8cdc2
author Eino-Ville Talvala <etalvala@google.com> 1403553011 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403553011 +0000

am 405a672b: am 7b80334d: am 8390c35f: am 26825617: am 51bb20d6: Camera2: Use hidden APIs

* commit '405a672bd125615c5b7177ecb1d8d23dffa8cdc2':