Merge commit 'b3c1f1cff4ecf5c88a0bd00d421beeb022bb41e4' into eclair-mr2-plus-aosp * commit 'b3c1f1cff4ecf5c88a0bd00d421beeb022bb41e4': move event log tags used by SyncAdapter into a local .logtags file