This reverts commit 4869faf465. Change-Id: I58df9b8161d711a9c0187af1f1a1dc279fb9d9ab
4869faf465
This reverts commit 64fde6f4e9. Change-Id: I61940b6e2936c7c7f048af222602226e5588c268
64fde6f4e9
It also makes AccountSettings respond to the SYNC_SETTINGS intent, which it is currently triggered by Calendar and could be triggered by Gmail. Bug: 16076571 Change-Id: I2c55262a87e46ba88f36a90a2f8f27d08f88e851