OSDN Git Service

am 8d7e1693: am d1d6467d: Camera: Correct stream id types
authorZhijun He <zhijunhe@google.com>
Mon, 9 Sep 2013 18:33:00 +0000 (11:33 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 9 Sep 2013 18:33:00 +0000 (11:33 -0700)
* commit '8d7e1693148c48e5e6ef3095ed8db2334c6b8c81':
  Camera: Correct stream id types


Trivial merge