| commit | 5cf4b4e1ed7a24f95440a3f072a60e2a3c1c7bec | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Fri Jul 10 01:54:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 10 01:54:35 2015 +0000 |
| tree | 8619e78a3b418881386c28c5cd437f35416761ee | |
| parent | f37143d8a55afc6481d31de1c6f8e8db9578ef1d [diff] | |
| parent | 3f8fbfdb9bde70454f617ab8f59874bdf132cb29 [diff] |
am 3f8fbfdb: (-s ours) am 982719b1: (-s ours) DO NOT MERGE ANYWHERE. reset back to 570052f with history. * commit '3f8fbfdb9bde70454f617ab8f59874bdf132cb29':