tree c49ec0cab47aea42a7f475cfc2dbcb54e13609c8
parent e18163b17501a145f6f7f4d548e8eeff202501cc
parent 9d556441b445e7a30f55becf274d6874fdbdb969
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576484103 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576484103 +0000

Merge "[Setting] Code cleanup" am: 126df6441b am: 9d556441b4

Change-Id: I956cb317ec98a5f6e9083b46f949451cf7e84613