Merge "Minor code improvement" into mnc-dev
tree: fe3606c8230f64b75ef5b40c1d06b31f0b97621e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml