tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 867cd087e32ac224ad87145f0b446a5606de0afe
parent 91c11b28d57c026d507488c58feedebf7fee6f31
author Adam Cohen <adamcohen@google.com> 1445300924 +0000
committer android-build-merger <android-build-merger@google.com> 1445300924 +0000

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

* commit '91c11b28d57c026d507488c58feedebf7fee6f31':