OSDN Git Service

am 34a4a375: (-s ours) am 8b226af5: am c89b9122: am b5eb1ffa: Merge "gcam: Fix previe...
authorRuben Brunk <rubenbrunk@google.com>
Wed, 30 Apr 2014 18:14:44 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:44 +0000 (18:14 +0000)
* commit '34a4a375b48d4cba96ecb333e8f9e6e7042c3384':


Trivial merge