OSDN Git Service

am f6bf65e9: Pipe context through to camera
authorSascha Haeberling <haeberling@google.com>
Sat, 6 Sep 2014 02:13:09 +0000 (02:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 6 Sep 2014 02:13:09 +0000 (02:13 +0000)
* commit 'f6bf65e9442f2fb7042e37ec21bf1c6c4fbd9bb6':
  Pipe context through to camera


Trivial merge