tree 58b0ea5dd6ea289298cf6def0544c8c5cf875d04
parent 321c60b479b16d9065c7205d14503b42da2e56d0
parent 73a99f447e2395ea63e72a03b53ddf2711afaf89
author Dan Willemsen <dwillemsen@google.com> 1547156889 -0800
committer android-build-merger <android-build-merger@google.com> 1547156889 -0800

Merge "Replace USER with BUILD_USERNAME" am: 072e9fe5bf
am: 73a99f447e

Change-Id: I99757e8935f2091e2c1d3575d27bafa0b7961e58