tree b2a0c0a27187eb7ec0cf12b63c7b101b061b39fb
parent 0a53e6eee2628f1066e4693b52ff6bda23be9b81
parent 504844526f1b7afec048c6d2976ffb332670d5ba
author Michael Chan <chanm@google.com> 1346966924 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346966924 -0700

am 50484452: Rename calendarcommon to calendarcommon2 to workaround OEM silliness

* commit '504844526f1b7afec048c6d2976ffb332670d5ba':
  Rename calendarcommon to calendarcommon2 to workaround OEM silliness