tree c165ad8149052a09c59e34e07ee7071df08ee7df
parent 5da9fe3d79a948184bb377cb55dea4707e9eb5b0
parent fad9571dc59e822d6d59ad163b55799de9d1bc34
author Mark Chien <markchien@google.com> 1544516616 -0800
committer android-build-merger <android-build-merger@google.com> 1544516616 -0800

Merge "Upstream Configuration should also consider automatic configuration"
am: fad9571dc5

Change-Id: I9b4ae170dbeda9186dfae256871fa7e790a401e7