tree 5940ede9366adc1276d8a916bd7bfd78b10ffaed
parent 3c928c3a7a9684501664a59082a2583347e47664
parent 1da3b602130d71ac3bff1a1fdecdc5e0d7b9d701
author Eino-Ville Talvala <etalvala@google.com> 1380575548 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380575548 -0700

am 1da3b602: Camera2 API: Hack: Always use async mode with GLConsumer

* commit '1da3b602130d71ac3bff1a1fdecdc5e0d7b9d701':
  Camera2 API: Hack: Always use async mode with GLConsumer