tree 920a2c2d5fba1bf2e7122dce66abf854c72906f5
parent 1f657da4f74466a11a8ad0978c981cf842ff0493
parent df88b401e8aebe3687a78c338a57914daf3d70e0
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1516747861 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1516747861 +0000

Merge changes from topic "am-c310f9b4-18a7-4504-8179-49be1ab1d4a7" into oc-mr1-dev

* changes:
  [automerger] Fix VTS test which turns off radio. am: 71620817a9  -s ours am: 986facc698 am: 379ad11204
  [automerger] Fix VTS test which turns off radio. am: 71620817a9  -s ours am: 986facc698
  Fix VTS test which turns off radio. am: 71620817a9  -s ours