tree b676cc16d379478e8afdf21b5e45d0f00b5ec741
parent 190e46103518fb84bd83da8ae1f905139e016348
parent 7eff21047dd663d6322d0c65a3e3ed453dfd54a4
author Adam Cohen <adamcohen@google.com> 1445310374 +0000
committer android-build-merger <android-build-merger@google.com> 1445310374 +0000

am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop am: 91c11b28d5 am: 7e88e90afc am: b75de587c5 am: 29a81daa0d am: d077b9d137 am: 9a4f2f42c9 am: b05dcc69ad am: 1c38f7e1d3
am: 7eff21047d

* commit '7eff21047dd663d6322d0c65a3e3ed453dfd54a4':