Merge "Renumber UMA constants." into nyc-dev
tree: 8ea657f04debf69a4cea878bcd2ba2fda0b0f40e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. lint.xml
  7. wrap_alpha.py