| commit | da92d70c9d802364bcbccb18f5d7cd4d0f7e7efc | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Thu Sep 24 18:45:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 24 18:45:46 2015 +0000 |
| tree | c7172039125c29241f3c547a0b35a29d674e994f | |
| parent | 29ad2629e6d5d54b1c08ba30e94d1bc06674f278 [diff] | |
| parent | 2974e05e6ce775ac12ca27c2fe5418fe083aeb11 [diff] |
am 2974e05e: (-s ours) 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 '2974e05e6ce775ac12ca27c2fe5418fe083aeb11': DO NOT MERGE: CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend