Merge "Small UI fixes" into nyc-dev
tree: 3d16635ae9df0dab480b8edaf2a204afdae7b880
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml