tree 525d3e4d161b900c4db83775e899692c46a70ff6
parent 66fecc9c299f404940c974cb88bcd2863a3df565
parent 30080352d59f1ca86ac868de5876086794b41493
author Yuexi Ma <yuexima@google.com> 1533947459 -0700
committer android-build-merger <android-build-merger@google.com> 1533947459 -0700

[automerger skipped] use lazy android device registration am: 65f31088e1  -s ours am: f7ec18facb  -s ours
am: 30080352d5  -s ours

Change-Id: Ia77d5a383c8413ac6f9bd8edd0acc955796ccec9