OSDN Git Service

am 35965b92: (-s ours) am ef339df9: am 107e93ee: am eb605b4a: Don\'t crash Photo...
authorSascha Haeberling <haeberling@google.com>
Wed, 30 Apr 2014 18:14:55 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:55 +0000 (18:14 +0000)
* commit '35965b92472f0751e3c1a3b9737b4daff05c3efd':


Trivial merge