| commit | 806d8cf88abe9289bb5dae03876244c6b178ec82 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Thu Sep 24 18:33:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 24 18:33:18 2015 +0000 |
| tree | 8d9bbcfa4bc6d8846ea963a98583d0ee6a821dd0 | |
| parent | 89820f25bf19703737ff7832960d6375e50be76f [diff] | |
| parent | 6e58e710c336b2af9cccd6bfa33eb919760eff81 [diff] |
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 '6e58e710c336b2af9cccd6bfa33eb919760eff81': DO NOT MERGE: CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend