OSDN Git Service

Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier
authorQiwen Zhao <zhao@google.com>
Wed, 10 Sep 2014 15:20:46 +0000 (15:20 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 10 Sep 2014 15:20:47 +0000 (15:20 +0000)

Trivial merge