am f3dcf4a2: am e6a4b5d8: am a6302fad: libcamera2: new return code when camera in use
authorAlex Ray <aray@google.com>
Fri, 6 Dec 2013 22:19:15 +0000 (22:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Dec 2013 22:19:15 +0000 (22:19 +0000)
* commit 'f3dcf4a26a8f4d95377015db72aea2ea98edb5b9':


Trivial merge