OSDN Git Service

am fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into...
authorQiwen Zhao <zhao@google.com>
Wed, 10 Sep 2014 15:29:28 +0000 (15:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Sep 2014 15:29:28 +0000 (15:29 +0000)
commit031bcdbd1ce646d11542165f626f7590bfa85130
treefcb646d8ce47880e230d3cbed21360c1173dc1bb
parentaefc884cf5bd12b8caa0a657c33072010cd3234c
parentfd97c6da954f3e3e6f8547f6f7363cddba6c1b9a
am fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier

* commit 'fd97c6da954f3e3e6f8547f6f7363cddba6c1b9a':
  DO NOT MERGE: Adjust for camera2 API changes