OSDN Git Service

am 3c2a2701: (-s ours) am 2abaa8ed: am 5152eb13: am 4f4a1678: Fix Camera2 build.
authorMangesh Ghiware <mghiware@google.com>
Wed, 30 Apr 2014 18:14:49 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:49 +0000 (18:14 +0000)
* commit '3c2a2701777c1ccb5b067be6ef5b9e0f1ad2efee':


Trivial merge