OSDN Git Service

am a605959f: (-s ours) am c6456b7b: am 031bcdbd: am fd97c6da: (-s ours) Merge "DO...
authorQiwen Zhao <zhao@google.com>
Fri, 19 Sep 2014 06:17:40 +0000 (06:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Sep 2014 06:17:40 +0000 (06:17 +0000)
commite0dccb205cb32743bf871a2954463ff2092242c1
tree3bcb3f12b6d50d716e75ef688104c3cace664e77
parentb720720992842966e0ebd84382b2737e873b19d1
parenta605959fe487264591fa7f3b1d541b07b1e8bd7a
am a605959f: (-s ours) am c6456b7b: am 031bcdbd: am fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier

* commit 'a605959fe487264591fa7f3b1d541b07b1e8bd7a':