tree fcf23a25aadc660bd2dbb8b5178da454e8a00f08
parent bd92113aa4b4f39c1e958985bdc5fe5b0ce3c254
parent 29a81daa0d2faecca8fbaa36e04d85ac94242088
author Adam Cohen <adamcohen@google.com> 1445304661 +0000
committer android-build-merger <android-build-merger@google.com> 1445304661 +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

* commit '29a81daa0d2faecca8fbaa36e04d85ac94242088':