am ac21dce2: am 2fc43c35: am ff33d0b2: Merge "libcamera2: fix test crash issue due...
authorZhijun He <zhijunhe@google.com>
Fri, 6 Dec 2013 22:19:13 +0000 (22:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Dec 2013 22:19:13 +0000 (22:19 +0000)
* commit 'ac21dce2b0be89048630dac6289aca64e8b63f9e':


Trivial merge