Merge "Small UI changes from UX feedback" into nyc-dev
tree: 486c9fe35c0fe623caa6c03f9e07355f642ee362
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml