Skip to content
Commit f666e362 authored by Daniel Sandler's avatar Daniel Sandler Committed by android-build-merger
Browse files

[automerger skipped] Merge "Add configurable default setting for assistant... 

[automerger skipped] Merge "Add configurable default setting for assistant componentname" into pi-dev am: afda78ad  -s ours
am: 8b6a2e85  -s ours

Change-Id: Ic8d84bfc4e39f1777190e16a651e2cbf2313f8e6
parents 07a9c42c 8b6a2e85
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment