Merge "Guard against NPE in equals checks." into nyc-dev
tree: b94810ab8fbb87862925c80b1911d190bbdeb777
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. lint.xml
  7. wrap_alpha.py