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)
* commit '9eb0eb55e686c84d0003cdcd60c76e08ed369468':
  DO NOT MERGE Revert "Update camera2 API usage"


Trivial merge