tree 95008473d355d6e562b8785cfb885d7faa8f5e4f
parent f847cd4cf02724db7aaa32fb2a20e6c2e9d3d1af
parent 770a681b2f5b00e699920317bff04a24676ae143
author Adam Powell <adamp@google.com> 1285119174 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285119174 -0700

am 770a681b: (-s ours) am 9aed3002: Text selection anchors changed to use windows

Merge commit '770a681b2f5b00e699920317bff04a24676ae143'

* commit '770a681b2f5b00e699920317bff04a24676ae143':
  Text selection anchors changed to use windows