tree f3ca80142e388284c0fbdfa5dccc188d43aec2cc
parent bc7d88eacb68a28d9fc9ef2064f8d7fdea8e4a36
parent d7adbab669f922e02193eaf819ce32518dc70e8d
author Winson Chung <winsonc@google.com> 1383854529 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383854529 -0800

am d7adbab6: Merge "Save and restore the correct content type when rotating while in AllApps." into jb-ub-now-jolly-elf

* commit 'd7adbab669f922e02193eaf819ce32518dc70e8d':
  Save and restore the correct content type when rotating while in AllApps.