OSDN Git Service

am 8d516822: (-s ours) am ac6fffd7: am 46132e66: am b27668f0: Merge "Only delete...
authorztenghui <ztenghui@google.com>
Wed, 30 Apr 2014 18:14:49 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:49 +0000 (18:14 +0000)
* commit '8d516822fd559404020585b2ae157345bd13b422':


Trivial merge