tree 18781a7d0302d74eada66e493388a33d70e8075b
parent f6b97f7391aa0c3c4f67b3c9ed4d5c6a29759c74
parent f38a2eb1648dffc44ada50d4344f37679ae55b34
author Adam Cohen <adamcohen@google.com> 1413649677 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413649677 +0000

am f38a2eb1: am 91c11b28: am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop

* commit 'f38a2eb1648dffc44ada50d4344f37679ae55b34':
  Don't let old Launcher activity interfere with new one