[automerger skipped] DO NOT MERGE Adding the storage preference screen to settings.
am: 492194ddd4 -s ours
am skip reason: subject contains skip directive

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