| commit | d5153c64552725dd0ad383b925bb833d63101596 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Fri Jul 10 02:44:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 10 02:44:53 2015 +0000 |
| tree | 095103a470538fe5411a943e55e6f897559708ac | |
| parent | d083f89ce1833f9bbae6dc9a5a8d181a91f7bd7c [diff] | |
| parent | dd6b3ff8695e8fc3bf374b607444ebc829067c24 [diff] |
am dd6b3ff8: (-s ours) 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 'dd6b3ff8695e8fc3bf374b607444ebc829067c24':