tree 042d51d53a99ad458d780156b6e297d73a3646a0
parent 7d1d4af3415ec369c5c1d481dca1a3ff8502dca6
parent 75d958c40e67c338d65df185ce1f09b164c58d49
author Maurice Lam <yukl@google.com> 1438195382 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438195382 +0000

am 75d958c4: Merge "Disable launching assist during setup" into mnc-dev

* commit '75d958c40e67c338d65df185ce1f09b164c58d49':
  Disable launching assist during setup