am e95788b7: am 8bc09dfb: am 3a3f33de: am e26185db: am 50c36b9d: (-s ours) Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev

* commit 'e95788b7bc1cba6fa2e0b38298b51404e75987d4':
  Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS