OSDN Git Service

am 5152eb13: am 4f4a1678: Fix Camera2 build.
authorMangesh Ghiware <mghiware@google.com>
Tue, 15 Oct 2013 05:12:37 +0000 (22:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Oct 2013 05:12:37 +0000 (22:12 -0700)
* commit '5152eb131ed75629746b1bbc0302cb0f5c56c214':
  Fix Camera2 build.


Trivial merge