tree 48f112032954c03d7fca7fb5cadbbafed8f23cd9
parent ccf163bfb6b491c5ce711538f7dfa581a4ccbe06
parent ffd354d6a4883796fb6cf53e22acbcb77c56612a
author Yao Chen <yaochen@google.com> 1556159192 -0700
committer android-build-merger <android-build-merger@google.com> 1556159192 -0700

Merge "Fix SettingsProto corruption" into qt-dev
am: ffd354d6a4

Change-Id: Ic60a1b9805c214454e558b729606f861e56d5a87