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
am: 1a305bd91c

Change-Id: I771dad6186a7ac9feccfc522bf81066de890139b
tree: 0cb92454de5f905ea30b44539f98a5fd7dfc670f
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml