tree c53b7435dd988e85a9ffcdd33e777b38b7e37415
parent 1d440d2c5d6d674569ca3fa229d16484a88ff1a2
parent 10eaa7addad0136f1c630742ccde75e622a3f108
author Ruslan Tkhakokhov <rthakohov@google.com> 1564153666 -0700
committer android-build-merger <android-build-merger@google.com> 1564153666 -0700

Merge "Several preferences lost during P->Q B&R" into qt-r1-dev
am: 10eaa7adda

Change-Id: Ib4fc571fde9155f8c4de5341213e3952286057ab