tree f0ce092833b0d6d003ef18a7a7bff4a140a61c23
parent 9204bedc4ad1d4337d7b344ae06878676d16d544
parent 053b71d07df1c34b3bc3b9c20e6f02591adf078c
author Mark Lu <marklu@google.com> 1468288967 +0000
committer android-build-merger <android-build-merger@google.com> 1468288967 +0000

Merge \"Merge \\\"docs: Updated link to UI Automator reference in \\\"Testing UI\\\" doc\\\" into nyc-dev am: 9c0b602beb am: 7661ca7a64\" into nyc-mr1-dev-plus-aosp
am: 053b71d07d

Change-Id: Ibb557f4863aa30bec91da6eb309e1460bdeb5136