tree a6bcaff6dea245ff138a402c0c9fcd78c2ff18a0
parent 9a50d7579516ee3b877aab84f412bdd2d0fe03b4
parent 4cdec67417f977427422b13e8218246a507cb2fc
author Treehugger Robot <treehugger-gerrit@google.com> 1519306750 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1519306750 +0000

Merge changes I8e432950,Id325b8cf

* changes:
  Build android.test.base/legacy against SDK
  Fix visibility issues with android.test.mock.stubs