tree 2daf2dc95db07153fb138b7308f448cf034187f0
parent 5d2cd54c3bcbb35c54dcc90cb75954dc3e929617
parent 1fd656cfebe60c5a03cbcd1d711144394b808ddc
author Chen Xu <fionaxu@google.com> 1521158581 +0000
committer android-build-merger <android-build-merger@google.com> 1521158581 +0000

Merge "support expanding advanced settings from intent extra" am: 838bc45caf am: 5a67699e7e  -s ours
am: 1fd656cfeb  -s ours

Change-Id: I9fca5472d99f53a35559ed664c8e70845251638e