Merge "Multiple custom themes 2/n" into ub-launcher3-qt-dev
am: 0db48246ed

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