tree 049cbf7b3b433da7463f9bdfe89db3cc823a900e
parent 965625055c3a6b64f2bcd4c13c99b2092db28a4f
parent 6125ea192e3abf09024dcc272502ab751399fb58
author uabdullah <uabdullah@google.com> 1529523870 -0700
committer android-build-merger <android-build-merger@google.com> 1529523870 -0700

Merge "Update settings"
am: 6125ea192e

Change-Id: Ie1b92f1d824384178faeb8f14554bacf2fe188a8