OSDN Git Service

am 5ad4114f: (-s ours) Merge "Updating the Camera tests makefile and source to reflec...
authorJason Noguchi <jnoguchi@google.com>
Thu, 22 Aug 2013 22:47:12 +0000 (15:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 Aug 2013 22:47:12 +0000 (15:47 -0700)
* commit '5ad4114f1ad766fa0ec9a9e6469313dd000f426d':
  Updating the Camera tests makefile and source to reflect recent split between camera and gallery apps.


Trivial merge