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


Trivial merge