tree 4022bb3e6cf8f6333aa7441fc33d203a1666bfbf
parent 5c6474da600dc828805d86e50ce357bee908131b
parent f0129b13d1edac399c02dbd93f574a7e3f873525
author Adam Cohen <adamcohen@google.com> 1383617436 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1383617437 +0000

Merge "Fix bug where cancelling config activity leaves user stuck in bad state" into jb-ub-now-jetsonic