[automerger skipped] DO NOT MERGE Allow static overlays of the car/libs used by Settings. am: 240b093949 -s ours
am: 9dce000a48

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