Merge "Fix state restoration ordering for ThemePicker." into ub-launcher3-qt-dev
tree: 02e71bc045d1772f1dce4747aeacc024b7b8a4de
  1. res/
  2. robolectric_tests/
  3. src/
  4. src_override/
  5. Android.mk
  6. AndroidManifest.xml