tree 791e8a024420d9fc398174c0a56fc1722d4c771c
parent 836d372b84b94d31795f1bc5ad218a231929b40d
parent 9a4f2f42c9a6518002547fff05109c9d8b110a6f
author Adam Cohen <adamcohen@google.com> 1445306774 +0000
committer android-build-merger <android-build-merger@google.com> 1445306774 +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

* commit '9a4f2f42c9a6518002547fff05109c9d8b110a6f':