OSDN Git Service

am 58eb8853: am 420c2c42: Merge "Adjust for camera2 API changes" into lmp-dev
authorEino-Ville Talvala <etalvala@google.com>
Tue, 16 Sep 2014 15:21:25 +0000 (15:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Sep 2014 15:21:25 +0000 (15:21 +0000)
* commit '58eb8853bc9002dfcb7caf48c251d90070eda5a0':


Trivial merge