tree 78d0581c24a93cda908f9b2c0c56df711fa4a4b9
parent 4fd8e43afe5952c60a29d507a07541a88b42fd5f
parent 25763c1626e130dc073a269a198d1bc89f3ccb9d
author Yuexi Ma <yuexima@google.com> 1534341396 -0700
committer android-build-merger <android-build-merger@google.com> 1534341396 -0700

[automerger skipped] Fix fuzzer template android_device register am: b6a202255d am: dd7e65c353  -s ours am: 3796c55c38  -s ours am: 04c272ab3e  -s ours am: 792500c6c9  -s ours
am: 25763c1626  -s ours

Change-Id: I605cacdf7d1a7ff471095a3cd08862528fd56a1f