| commit | dd6b3ff8695e8fc3bf374b607444ebc829067c24 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Fri Jul 10 02:29:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 10 02:29:37 2015 +0000 |
| tree | 095103a470538fe5411a943e55e6f897559708ac | |
| parent | 9b70ab7a3cb260205e81e40ba181a86710d2eb95 [diff] | |
| parent | 89c7bd8695dc243e7c1e1f4dc011a9b1b9552ff5 [diff] |
am 89c7bd86: (-s ours) am 5cf4b4e1: (-s ours) am 3f8fbfdb: (-s ours) am 982719b1: (-s ours) DO NOT MERGE ANYWHERE. reset back to 570052f with history. * commit '89c7bd8695dc243e7c1e1f4dc011a9b1b9552ff5':