OSDN Git Service

am cd54f844: am 567534e2: am ca25627f: camera: Add a hwlevel attribute, annotate...
authorIgor Murashkin <iam@google.com>
Wed, 29 Oct 2014 07:12:52 +0000 (07:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Oct 2014 07:12:52 +0000 (07:12 +0000)
* commit 'cd54f8444c85655143ccf2316d18f9aea430e0d6':


Trivial merge