am 8cfeacdc: Import revised translations

Merge commit '8cfeacdcb371f0f7df5e3532a96fd75125f15224' into froyo-plus-aosp

* commit '8cfeacdcb371f0f7df5e3532a96fd75125f15224':
  Import revised translations
am 572c06f9: DO NOT MERGE - Revert workaround for KeyguardLock problem

Merge commit '572c06f91be8c809b8978d985259564f88c6f212' into froyo-plus-aosp

* commit '572c06f91be8c809b8978d985259564f88c6f212':
  DO NOT MERGE - Revert workaround for KeyguardLock problem
am 7a358316: Merge "Work around problem w/ large CalendarProvider2 transactions" into froyo

Merge commit '7a358316ae1c52fadf7ce8470fc5d257d1a71eaa' into froyo-plus-aosp

* commit '7a358316ae1c52fadf7ce8470fc5d257d1a71eaa':
  Work around problem w/ large CalendarProvider2 transactions
merge from froyo-plus-aosp

Change-Id: I5c020c7dd4e9b0629254ff027f11af484d47ba8c
am 7a9b65fc: merge from froyo-plus-aosp

Merge commit '7a9b65fc1306714db3eaac604b0b95960b3e783a'

* commit '7a9b65fc1306714db3eaac604b0b95960b3e783a':
Merge "Use Fragment's context menu API."
Fix bug #1661857 (switch from using meta feed to the new allcalendars feed)

- update Events.DELETE constant

Change-Id: I3876025d8052d291029ad2bc2bfde2ed241dda2d
Merge "Fix bug #1661857 (switch from using meta feed to the new allcalendars feed)"
Test for interaction between ImapStore and vendor policy.

Change-Id: I092b3a0f2f40d9aa19f2f61066362099c8b3f50b
Merge commit 'ecaddea386c9be97fffaee8fa6a2a7d759516ab5' into oxygen_1006

* commit 'ecaddea386c9be97fffaee8fa6a2a7d759516ab5':
  Fix bug #1661857 (switch from using meta feed to the new allcalendars feed)

Conflicts:
	src/com/android/exchange/adapter/CalendarSyncAdapter.java
Merge (-sours) commit '34f29c8a7478cf8c85578d176ac27d973ecca7e4' into oxygen_1006

* commit '34f29c8a7478cf8c85578d176ac27d973ecca7e4':
  Test for interaction between ImapStore and vendor policy.