tree f03497842a67691f8de5be1c88f783ce1b752359
parent 8a8d67dae6d0f161b2bd9805eb0e9b40f4776991
parent 5e8e76b677859e1372ee19c6c169a962f32056f0
author Michael Chan <mchan@android.com> 1252539040 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1252539040 -0700

am 5e8e76b6: am 782e389d: b/1565071 Rename the string "Presence" to "Show me as" to match the web ui for Calendar.

Merge commit '5e8e76b677859e1372ee19c6c169a962f32056f0'

* commit '5e8e76b677859e1372ee19c6c169a962f32056f0':
  b/1565071 Rename the string "Presence" to "Show me as" to match the web ui for Calendar.