tree cfaaeda58efcdbe1de0a600b322bf50cb469227b
parent ff3ae2fbec12b4f1b7947f999d3a20e62c53a5b3
parent 0bebaf393a6e531e5c0b20306c4e8ebc9e4d64f2
author Xia Wang <xiaw@google.com> 1360624734 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360624734 -0800

am 0bebaf39: Change uiautomation -> uiautomator

# Via Xia Wang
* commit '0bebaf393a6e531e5c0b20306c4e8ebc9e4d64f2':
  Change uiautomation -> uiautomator