OSDN Git Service

am 23bf7212: am 51f0d3f5: resolved conflicts for merge of 70555a16 to master
authorYing Wang <wangying@google.com>
Mon, 12 May 2014 23:30:22 +0000 (23:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:30:22 +0000 (23:30 +0000)
commitade42628a350e8a163793ee9431e715d96dbf8ad
treedb34eca2da5ec1662b262862fc44c323209fcb14
parentad238b9e08c313f12994a54d0b89ba61335fa1c9
parent23bf7212ce4ee925569eba7a0c9e4197981f9a29
am 23bf7212: am 51f0d3f5: resolved conflicts for merge of 70555a16 to master

* commit '23bf7212ce4ee925569eba7a0c9e4197981f9a29':