OSDN Git Service

am 76215c98: (-s ours) DO NOT MERGE Update Camera2 to use latest APIs
authorAlan Newberger <alann@google.com>
Mon, 8 Sep 2014 19:03:56 +0000 (19:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Sep 2014 19:03:56 +0000 (19:03 +0000)
* commit '76215c98a9a11d87b5ce9d2b4198654c2b8bbddf':
  DO NOT MERGE Update Camera2 to use latest APIs


Trivial merge