OSDN Git Service

am 4997b532: (-s ours) am 8455977f: am 08d82bae: Merge "Update the data after edit...
authorztenghui <ztenghui@google.com>
Wed, 30 Apr 2014 18:14:28 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:28 +0000 (18:14 +0000)
* commit '4997b532b6c470d16ccc2681b592674119246100':


Trivial merge