tree 575217b88d4dcaa04d4ea222fc342c926645a8fa
parent 3da8e95c366bcd41191b5d34bccdf3f5b9310a15
parent 19099e68bba4afab0f54e489b9730b3f50041ffb
author Colin Cross <ccross@android.com> 1540420021 -0700
committer Colin Cross <ccross@android.com> 1540420021 -0700

Merge remote-tracking branch 'aosp/upstream' into master

* aosp/upstream:
  Add link dependency on test package archive

Test: m checkbuild
Change-Id: I9a039504e2dbe864d6b5b832652d90e62e8ff052