OSDN Git Service

am 44c32d17: (-s ours) am 27408847: am 9a09d511: am 4c0aede4: Merge "Only show delete...
authorztenghui <ztenghui@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 '44c32d1710482fd45aacfd077d206ad2de1df588':


Trivial merge