tree 18781a7d0302d74eada66e493388a33d70e8075b
parent d54cf54387d8c434fefd18ce7a6bdbf3ea586b39
parent 91c11b28d57c026d507488c58feedebf7fee6f31
author Adam Cohen <adamcohen@google.com> 1413648494 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413648494 +0000

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

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