OSDN Git Service

am 031bcdbd: am fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API chang...
authorQiwen Zhao <zhao@google.com>
Wed, 10 Sep 2014 15:35:24 +0000 (15:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Sep 2014 15:35:24 +0000 (15:35 +0000)
commitc6456b7b90fdc367888a50009821c916e04c143a
treefcb646d8ce47880e230d3cbed21360c1173dc1bb
parent0c7af4631f8764c89626f16e47cfe88bb212db0a
parent031bcdbd1ce646d11542165f626f7590bfa85130
am 031bcdbd: am fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier

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