tree 787b954cbde66ca2e32b8858498a16e75039e359
parent 2ed99e861b4be73620fd6fdc24a13230e096921c
parent 1a85c5839c91942b3c7dd0da5992db4d98defdc3
author Adam Cohen <adamcohen@google.com> 1412118220 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1412118220 +0000

Merge "Don't let old Launcher activity interfere with new one" into ub-now-porkchop