Merge "Properly handle default custom theme options" into ub-launcher3-qt-r1-dev
am: 8f77b2bc3e

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