tree 00a67a64cf847f0bc2a9146a54cad040fbac78ac
parent f41776b211ce9d3bcb7902cb29ffd0cbacab685d
parent 386a9476160ecd8d7d647d1a305126ec0917e0ab
author Winson <winsonc@google.com> 1464320572 +0000
committer android-build-merger <android-build-merger@google.com> 1464320572 +0000

Merge "Prevent setting the launch task id when docking." into nyc-dev
am: 386a947616

* commit '386a9476160ecd8d7d647d1a305126ec0917e0ab':
  Prevent setting the launch task id when docking.

Change-Id: I6f54a53099dd8b4c53674a866dc3fdfba1b59b70