OSDN Git Service

am 982719b1: (-s ours) DO NOT MERGE ANYWHERE. reset back to 570052f with history.
authorQiwen Zhao <zhao@google.com>
Fri, 10 Jul 2015 01:43:07 +0000 (01:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Jul 2015 01:43:07 +0000 (01:43 +0000)
commit3f8fbfdb9bde70454f617ab8f59874bdf132cb29
tree8619e78a3b418881386c28c5cd437f35416761ee
parentf37143d8a55afc6481d31de1c6f8e8db9578ef1d
parent982719b179aecc33aa6c258318fcbf6e4faa81d7
am 982719b1: (-s ours) DO NOT MERGE ANYWHERE. reset back to 570052f with history.

* commit '982719b179aecc33aa6c258318fcbf6e4faa81d7':