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
am: d295e2d1ce

Change-Id: Ib4e30abd28f4561fbc8df5278bd187012cc36932
tree: 4f0543b2484b701e1a5baa03d94c9dff663eab77
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml