tree 25ab185762dfb8ceb8e458752afdd1e42c8e9e75
parent bda2992d209fb8607eaa5132211470b714428ec8
parent 54552bd85a572c6141d540b1a8374db8452388be
author Xia Wang <xiaw@google.com> 1360624863 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360624863 -0800

am 54552bd8: am 0bebaf39: Change uiautomation -> uiautomator

# Via Android Git Automerger (1) and Xia Wang (1)
* commit '54552bd85a572c6141d540b1a8374db8452388be':
  Change uiautomation -> uiautomator