OSDN Git Service

am a596ed32: am d3611d6a: AOSP Camera source should run camera2 API on M
authorAlan Newberger <alann@google.com>
Fri, 19 Jun 2015 22:48:32 +0000 (22:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Jun 2015 22:48:32 +0000 (22:48 +0000)
* commit 'a596ed322aacf2ba005c95d4ae536ddb5f00a6c6':
  AOSP Camera source should run camera2 API on M


Trivial merge