Merge "Fix state restoration ordering for ThemePicker." into ub-launcher3-qt-dev
am: 1ec52f8df3

Change-Id: I349b6df96c016055242eb9a68800d0c4851d6603
tree: aea7e9d8879163fdb20afe5424a911fbd9d77427
  1. res/
  2. robolectric_tests/
  3. src/
  4. src_override/
  5. Android.mk
  6. AndroidManifest.xml