Merge "Refactor styles definitions for better readability" into ub-launcher3-qt-r1-dev
am: 55e87a932b

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