tree b059ec32ec8a3837ba85e6016ad0db67d7f605b9
parent 7f11e64ed4f92545faf2b699d6576bdd819ed75a
parent f30552080842452e181113bcd333d66b56403e92
author Sunny Goyal <sunnygoyal@google.com> 1458348897 +0000
committer android-build-merger <android-build-merger@google.com> 1458348897 +0000

Merge "Fixing broken instrumentation tests when run from command line" into ub-launcher3-calgary
am: f305520

* commit 'f30552080842452e181113bcd333d66b56403e92':
  Fixing broken instrumentation tests when run from command line