OSDN Git Service

am 42092d70: (-s ours) Merge "DO NOT MERGE: camera2: Disallow connectDevice for all...
authorRuben Brunk <rubenbrunk@google.com>
Wed, 11 Jun 2014 17:03:20 +0000 (17:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 11 Jun 2014 17:03:20 +0000 (17:03 +0000)
* commit '42092d7015b078a09c36de107d924fc8139ccf50':
  DO NOT MERGE: camera2: Disallow connectDevice for all old HALs.


Trivial merge