Merge "Fix class variable declaration." into mnc-dev
tree: 7f2284c4dba12a641244b950037eee160191f03d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags