tree 2036a6336e26858243b95579ce168d4111d1a007
parent 721971a7490393d606cb75ade4494ce9f5c5938a
parent 22fc1c9d7a1919a764a310d2080d4be2b5c65f28
author Daniel Xie <dxie@google.com> 1449798580 -0800
committer android-build-merger <android-build-merger@google.com> 1449798580 -0800

Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev am: 50c36b9da2  -s ours am: 188b260f0c am: b3627dacab am: d4d86a95bb am: 8ec5ed995b am: 7e9cef30e7
am: 22fc1c9d7a

* commit '22fc1c9d7a1919a764a310d2080d4be2b5c65f28':