| commit | 2974e05e6ce775ac12ca27c2fe5418fe083aeb11 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Thu Sep 24 18:37:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 24 18:37:50 2015 +0000 |
| tree | a4dec96062a7e5d1864ba1e159e955884dc7fb45 | |
| parent | 4076177ec4d0ccfab8c91efd2256b5cbd5720458 [diff] | |
| parent | 806d8cf88abe9289bb5dae03876244c6b178ec82 [diff] |
am 806d8cf8: am 6e58e710: am acfb0afb: am 7c2cebce: am 594bdf0d: (-s ours) am dc027495: am 67e32ffc: am d8aada95: (-s ours) Merge "DO NOT MERGE: CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into kitkat-cts-dev * commit '806d8cf88abe9289bb5dae03876244c6b178ec82': DO NOT MERGE: CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend