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)
commitfd97c6da954f3e3e6f8547f6f7363cddba6c1b9a
treee05df1ae507506a7bb90761af24c12420f31a464
parent42a5ad5a9c7e660854fd0552b81e025c16db9f05
parentdd38b94c6f21b528f0de706a69d853f24a9c9561
Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier