am c7afd922: am 97ef7637: - move the EventLog stuff out of ATSA - move the...
am c7afd922: am 97ef7637: - move the EventLog stuff out of ATSA - move the google calendar sync adapter settings out of Settings.java
Merge commit 'c7afd922'
* commit 'c7afd922':
- move the EventLog stuff out of ATSA