Reconcile with ics-factoryrom-release

Change-Id: Ie9aa46783ea037a38b5ac5728b831e58c3c5e072
tree: d14fcb2055f9f49247aa96acd1b08cb99baecd57
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. default.properties
  6. proguard.cfg