OSDN Git Service

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


Trivial merge