tree 00c23134f4cfab61aa884ac95775e65f15051adf
parent 71cedf9b0c3d4bdb95fcb15c9a26d55101209fa2
parent d5bed0f4b65f76f840c86b68ba2f0393db2efe8b
author Steve Elliott <steell@google.com> 1540317990 -0700
committer android-build-merger <android-build-merger@google.com> 1540317990 -0700

[automerger skipped] DO NOT MERGE: Add configurable default setting for assistant componentname
am: d5bed0f4b6  -s ours

Change-Id: Ic2a4a2d452d55ec87f678c7c4573b819aa145ebf