tree cba62d0d64153aa2169651696bc238591341d679
parent bd6fd14949e4b3bede118e8c9fe367ab655a57ee
parent e6ce2405a578d5eab2c461ec7cb90eadd33f1a8f
author Winson Chung <winsonc@google.com> 1414085462 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085462 +0000

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

* commit 'e6ce2405a578d5eab2c461ec7cb90eadd33f1a8f':