OSDN Git Service

am 2294bfcc: (-s ours) am 5e233f82: am 309cd179: am b0fbd543: Merge "Prevent picture...
authorDoris Liu <tianliu@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 '2294bfccdf07dc5c641a13b3c6d653d4dcc0412b':


Trivial merge