OSDN Git Service

am 3da3d8e6: am 1da3b602: Camera2 API: Hack: Always use async mode with GLConsumer
authorEino-Ville Talvala <etalvala@google.com>
Wed, 2 Oct 2013 01:46:50 +0000 (18:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Oct 2013 01:46:50 +0000 (18:46 -0700)
* commit '3da3d8e641cf38f81ba1e9b99de2e77e4ca9b138':


Trivial merge