tree 39bfe65679c3b273cf5dbec80f2483e8c34b030f
parent 55c8409e393d6d1b11345a76886eddf926bfac60
parent c52e9cfd3dfa23341ccd5034fa5ab5ce132bf624
author Hall Liu <hallliu@google.com> 1570047316 -0700
committer android-build-merger <android-build-merger@google.com> 1570047316 -0700

[automerger skipped] RTT changes for ignoring user-set setting am: 6a06be66aa am: 40d708ba1c -s ours
am: c52e9cfd3d -s ours
am skip reason: change_id I8039ba8061b83e315af7fb7007253978f9544100 with SHA1 f2daa02a7c is in history

Change-Id: If74e43ffe56497c45ed38ff50357de6092e69cc5