tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 7ef9fa7d6e3e25cd5028f7f52a474268452af7be
parent 7ec1b902bf3bdd6dfae08519db49301f4efc0861
author Adam Cohen <adamcohen@google.com> 1422685376 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685376 +0000

am 7ec1b902: am f08ff22b: am adf571c7: am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop

* commit '7ec1b902bf3bdd6dfae08519db49301f4efc0861':