tree 69577be5e2dbb1632690b450062cb32d5576df03
parent 36b1907693a4c6f4462018a683579f4c119d98bf
parent c7afd9221babd89ca4acd859c608f41c29f3731b
author Fred Quintana <fredq@google.com> 1260484927 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260484927 -0800

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

Merge commit 'c7afd9221babd89ca4acd859c608f41c29f3731b'

* commit 'c7afd9221babd89ca4acd859c608f41c29f3731b':
  - move the EventLog stuff out of ATSA