Fix crash when clicking color options
am: b7be651417

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