tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 5a7f0e05273a92a36a496f6241bee48c49fbba1f
parent 7e88e90afc2fce3e64735ee0f11b9098193253d3
author Adam Cohen <adamcohen@google.com> 1445302471 +0000
committer android-build-merger <android-build-merger@google.com> 1445302471 +0000

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

* commit '7e88e90afc2fce3e64735ee0f11b9098193253d3':