Merge "Fix folder and qsb inconsistency issue in ThemePicker Bug: 126417894" into ub-launcher3-master
tree: 15158c123eedb887785a0332c698c06995d34e14
  1. res/
  2. robolectric_tests/
  3. src/
  4. src_override/
  5. Android.mk
  6. AndroidManifest.xml