[automerger skipped] Merge "DO NOT MERGE Add the ability to clear a default app" into pi-car-dev
am: acc560af87 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibfcb09d4280655a9a832e02d37844561e99c0be6
tree: 0774f0f117994ffb3c7bb288112959b89d48234f
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg