OSDN Git Service

Merge changes Ia55ae13e,Ib3e2e6d2 into nyc-dev
authorRichard Uhler <ruhler@google.com>
Tue, 19 Apr 2016 16:24:12 +0000 (16:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 19 Apr 2016 16:24:13 +0000 (16:24 +0000)
commit0fca5f75f56f59d68fc6d3a891302efbebd621da
tree0311be18294a20cdbfd4450b6ff12b4d1d7db342
parent8b336cd546267dcb5b46991ce0d1227549eadda8
parent3aa7fb86baa175f6a1e15eabf4b455c533276bf0
Merge changes Ia55ae13e,Ib3e2e6d2 into nyc-dev

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