OSDN Git Service

am 45bd3fe4: (-s ours) am 1a7fed5f: am 1571239c: Merge "Add the trim functionality...
authorztenghui <ztenghui@google.com>
Wed, 30 Apr 2014 18:14:20 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:20 +0000 (18:14 +0000)
* commit '45bd3fe4581677f4da04d4c558930244e60ada25':


Trivial merge