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 'acfb0afb55f733eadb2eaf76b95abb28a802fbc7':
  DO NOT MERGE: CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend