OSDN Git Service

am e65a190d: (-s ours) am 2e2467c3: am 7c1ae08c: am 7ba4a88e: Merge "Sync Camera2...
authorSascha Haeberling <haeberling@google.com>
Wed, 30 Apr 2014 18:14:40 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:40 +0000 (18:14 +0000)
* commit 'e65a190d2635c8a5c7ce8fd1b4b14f33bbbe5cc1':


Trivial merge