tree c7172039125c29241f3c547a0b35a29d674e994f
parent 84572b99207568f852e231c03c7d494ac4f66430
parent 8ee83252d23319b8c7498bdd316755d3518f8811
author Daniel Xie <dxie@google.com> 1443118113 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443118113 +0000

am 8ee83252: am f79736a4: am 4c00f963: am bdfe21bf: am b969d4e7: am 62c2e665: Merge "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into lollipop-cts-dev

* commit '8ee83252d23319b8c7498bdd316755d3518f8811':
  CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend