Merge change 6719 into donut

* changes:
  Fix bug #1873249i: Apps can DoS/brick device
tree: 152eb5a86514600744092552c2eca9bf43256a9b
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE