tree 947206bd152cc912d67fdbc2abc483347b5e1820
parent 38ffaa1c51627cd3ccee2f45e1d06c2fdd4ed3ba
parent f298f4a7c779588821b744c7247fc896541cae57
author Allen Hair <allenhair@google.com> 1464125780 +0000
committer android-build-merger <android-build-merger@google.com> 1464125780 +0000

Merge "Deprecate shell-based UI Automator." into nyc-dev
am: f298f4a7c7

* commit 'f298f4a7c779588821b744c7247fc896541cae57':
  Deprecate shell-based UI Automator.

Change-Id: I0f8f99ddc4dd1048a84ab9f6f7edc19d923c7a75