tree d773639dfaaf0127283b4494f54a74d44a1e324a
parent 326e88800db5580e7121492c0a4b052241ea3b00
parent b75de587c52ee4f9ba5ada289c0675f1fafdc7f9
author Adam Cohen <adamcohen@google.com> 1445303568 +0000
committer android-build-merger <android-build-merger@google.com> 1445303568 +0000

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

* commit 'b75de587c52ee4f9ba5ada289c0675f1fafdc7f9':