tree 4ff7198df257f3a36c5c5b6a522aab186600e6e7
parent 74a8794b436679ac6d6149535da31955b2a952c3
parent adf571c7725f0281a3e37a4b6254818da956ca53
author Adam Cohen <adamcohen@google.com> 1422666560 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666560 +0000

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

* commit 'adf571c7725f0281a3e37a4b6254818da956ca53':