Merge change Id960437c into eclair

* changes:
  Ensure more parameters to be non-null.
tree: bb18b84db841f7f3419a8651e20e081bec135bed
  1. tests/
  2. tools/
  3. .gitignore
  4. Android.mk