Skip to content
Commit 8b6a2e85 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

Change-Id: I6f35d4dbe159cf34cfe541c68ff36e28d0cf1a2c
parents 6984c36c afda78ad
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