tree 0311be18294a20cdbfd4450b6ff12b4d1d7db342
parent 8b336cd546267dcb5b46991ce0d1227549eadda8
parent 3aa7fb86baa175f6a1e15eabf4b455c533276bf0
author Richard Uhler <ruhler@google.com> 1461083052 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461083053 +0000

Merge changes Ia55ae13e,Ib3e2e6d2 into nyc-dev

* changes:
  Disable stripped-dex test for no-dex2oat.
  Disable stripped-dex test on target.