tree cba62d0d64153aa2169651696bc238591341d679
parent 082d41ce10b75c9c29ae6c88e7fea679f3b77297
parent dc90f62fa6cb91e5abe19f69a031399326e11068
author Adam Cohen <adamcohen@google.com> 1414085442 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085442 +0000

am dc90f62f: am 5fb0a60d: am f52d5de9: am d120e994: am c18e4a92: Merge "Fix bug where cancelling config activity leaves user stuck in bad state" into jb-ub-now-jetsonic

* commit 'dc90f62fa6cb91e5abe19f69a031399326e11068':