tree 7c7104b11f98786abafc1bb0808183709602f59a
parent 76f6e26e85dd6fcddc2fc72e873f6f9851492c43
parent adf571c7725f0281a3e37a4b6254818da956ca53
author Adam Cohen <adamcohen@google.com> 1412118483 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412118483 +0000

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

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