OSDN Git Service

am 9eb0eb55: (-s ours) Merge "DO NOT MERGE Revert "Update camera2 API usage"" into...
authorAlan Newberger <alann@google.com>
Fri, 5 Sep 2014 23:32:14 +0000 (23:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Sep 2014 23:32:14 +0000 (23:32 +0000)
commit02965e8c82a707c037d72fe4c887e6270e900d54
treea5892f3a41c00943d3c94ea74cfbc7188ae9235b
parent626a14505d709202c9949df1bb3376d93c755d5b
parent9eb0eb55e686c84d0003cdcd60c76e08ed369468
am 9eb0eb55: (-s ours) Merge "DO NOT MERGE Revert "Update camera2 API usage"" into ub-camera-glacier

* commit '9eb0eb55e686c84d0003cdcd60c76e08ed369468':
  DO NOT MERGE Revert "Update camera2 API usage"