Merge "Catch potential NPE" into klp-dev
tree: d3ae430d9908420501202090b291b2dc3ff0878e
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. proguard.flags