am e8aa59d4: b/2106929 Resume to previous calendar view.

Merge commit 'e8aa59d4575d712601a133a9263acc23adbc8c17' into eclair-plus-aosp

* commit 'e8aa59d4575d712601a133a9263acc23adbc8c17':
  b/2106929 Resume to previous calendar view.