Merge "Handle lack of service better" into mnc-dev
tree: ec5a6968f9fca9c4202e5bd077bed10b1dd981c7
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE