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

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

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