OSDN Git Service

am baa0e6a4: (-s ours) am ac63f9c4: am 893981de: am 4f563f1d: Merge "Exit Camera...
authorMangesh Ghiware <mghiware@google.com>
Wed, 30 Apr 2014 18:14:39 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:39 +0000 (18:14 +0000)
* commit 'baa0e6a41872a36b9bf967fd445f65d8ddbc8f82':


Trivial merge