e53b7dd066
This reverts commit e1d8dcd9e170c1ed8a13b6e1256ea1fb22c26c49. Something funny happened in the process of submitting this, swathes of strings.xml became mis-encoded. Bug: 18224038 Change-Id: I0276ff3f880fe749546e8cc7e3e2f41c22c27705