tree fd1ba7150071cb166993da1decdd3f80549c7907
parent 0c968f4f8a8fe2e7d4aea00046512d8399ea3b01
parent 1c38f7e1d3a18b6c5ac84f9600a3db9667f34591
author Adam Cohen <adamcohen@google.com> 1445310042 +0000
committer android-build-merger <android-build-merger@google.com> 1445310042 +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

* commit '1c38f7e1d3a18b6c5ac84f9600a3db9667f34591':