tree 9ea07af5634b28551bbaae5bf18af1c707cdc534
parent f9b5a6bd07157f3bb021915b4c70b91a57c19670
parent 84a2951a335a465b8eb25eaaf43bd97b6c443ce3
author Bonian Chen <bonianchen@google.com> 1575434069 -0800
committer android-build-merger <android-build-merger@google.com> 1575434069 -0800

Merge "[Settings] Enable support on testing"
am: 84a2951a33

Change-Id: Idcd4d1013ef5c0e8581f94d40ac1770dc26b38fc