OSDN Git Service

am b5c7be29: am 30d8e12c: resolved conflicts for merge of d616a73d to master
authorYing Wang <wangying@google.com>
Mon, 12 May 2014 23:26:02 +0000 (23:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:26:02 +0000 (23:26 +0000)
commit57ce8cbe7391ed40474a2f31282df21ed4dd17b3
treedb34eca2da5ec1662b262862fc44c323209fcb14
parent5ba0cce8db13c63afb48ed2634c5ddd2c842fa88
parentb5c7be29701649567a61a7cf0569eeea904b9d8e
am b5c7be29: am 30d8e12c: resolved conflicts for merge of d616a73d to master

* commit 'b5c7be29701649567a61a7cf0569eeea904b9d8e':