tree 82db2e21449fd52665d7cff5f67b72ea655d185f
parent c46a3e64c533ce61e44f7d8ac0e44cbfd0baab6a
parent b05dcc69adc6b2ee08cd6ab619e6592a1668aca4
author Adam Cohen <adamcohen@google.com> 1445307811 +0000
committer android-build-merger <android-build-merger@google.com> 1445307811 +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

* commit 'b05dcc69adc6b2ee08cd6ab619e6592a1668aca4':