tree 8510e426b21a0adddc9d4458c4e367fc0acadb20
parent 078cfb9f88367053cc180ad89aa3b2f54cc23ade
parent 8d0a2882c023e4b578f20bebeaa4e603bdf79573
author Colin Cross <ccross@android.com> 1562730574 -0700
committer android-build-merger <android-build-merger@google.com> 1562730574 -0700

[automerger skipped] temporarily disable vendor file check for mainline am: 3f8eb7ec99 -s ours am: f842aea501 -s ours
am: 8d0a2882c0 -s ours
am skip reason: change_id I99431a9a342e9b0617510e250597f3024ef39322 with SHA1 ef212270fe is in history

Change-Id: Id3c413874ce55e9c4c97cc98e2c72a56ecc3e656