tree 94607acb698df0286cbc737747e23a121e6df83a
parent 4c3ec5a0d80add47d1c747bc9ac014fe67c8f04d
parent 6ccaf9061a66fad57becec3d4d68ddce330563f6
author Matthew Ng <ngmatthew@google.com> 1490931881 +0000
committer android-build-merger <android-build-merger@google.com> 1490931881 +0000

Merge "Fixes starting app in docked stack for cts tests" into oc-dev
am: 6ccaf9061a

Change-Id: I9e5f6139731b043eb48e2fe6b68b23a754d14d68