OSDN Git Service

am dc06cfbb: (-s ours) am 74c47a95: am f5230ffd: am 6ff701f5: Merge "gcam: Add generi...
authorRuben Brunk <rubenbrunk@google.com>
Wed, 30 Apr 2014 18:14:53 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:53 +0000 (18:14 +0000)
* commit 'dc06cfbbe835e9b8e448b64e83d94528893bce25':


Trivial merge