Merge "Fix clearAllPreferences test Bug: 35674347 Test: runtest --path packages/apps/EmergencyInfo/tests/src/com/android/emergency/edit/EditInfoActivityTest.java --test-method testClearAllPreferences Change-Id: I09562db0ab2ff8c7ee0c6be3e3d1dd5f048058f4" into nyc-mr2-dev
tree: 2ea1666d3e2be0debaccfbc2217c06d433232718
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml