am aaf4fcb0: am db543703: am a4863a2a: libcamera2: hardwareSupportedLevel should...
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 'aaf4fcb087a8a6e065e9f7970e01c429053dec3a':


Trivial merge