tree 95b5d890c4aff4d2517a582619f1248694335586
parent ebdb7fcc8ca851390bcf276929e8990ba23b6869
parent 52077b7a951153ce77e7354c6096b3bcfbec8c3e
author Adam Cohen <adamcohen@google.com> 1412118326 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412118326 +0000

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

* commit '52077b7a951153ce77e7354c6096b3bcfbec8c3e':
  Don't let old Launcher activity interfere with new one