OSDN Git Service

am c6456b7b: am 031bcdbd: am fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for...
authorQiwen Zhao <zhao@google.com>
Tue, 16 Sep 2014 15:21:28 +0000 (15:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Sep 2014 15:21:28 +0000 (15:21 +0000)
commita605959fe487264591fa7f3b1d541b07b1e8bd7a
tree34f4c9da47b0b28146ab48bed84020fa57110767
parenteed1539e431b8e757f70e387e9d84c052b729c84
parentc6456b7b90fdc367888a50009821c916e04c143a
am c6456b7b: am 031bcdbd: am fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier

* commit 'c6456b7b90fdc367888a50009821c916e04c143a':