tree fcf23a25aadc660bd2dbb8b5178da454e8a00f08
parent 6a8773d116a88b3ecc8ee97de5934635b4b0b7c7
parent d077b9d13700e9ce2271cb557b8788185ad2bbe9
author Adam Cohen <adamcohen@google.com> 1445305771 +0000
committer android-build-merger <android-build-merger@google.com> 1445305771 +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

* commit 'd077b9d13700e9ce2271cb557b8788185ad2bbe9':