Merge "Fix ThemePicker robo test build." into ub-launcher3-qt-dev
am: 29c30a3345

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