Merge "Merge commit '2dbe575' into master_merge" into mnc-dev
tree: 5c08e067bdbcc17fed25dfcf98c9ea5c3d4a9816
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. proguard.flags