OSDN Git Service

Merge changes Ia55ae13e,Ib3e2e6d2 into nyc-dev
authorRichard Uhler <ruhler@google.com>
Tue, 19 Apr 2016 16:34:15 +0000 (16:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Apr 2016 16:34:15 +0000 (16:34 +0000)
commitc70ba008834e8d7de456eaa09bc27e506121a495
tree0311be18294a20cdbfd4450b6ff12b4d1d7db342
parent865a15596bd6bc7978dfed798fcb5db474392e59
parent0fca5f75f56f59d68fc6d3a891302efbebd621da
Merge changes Ia55ae13e,Ib3e2e6d2 into nyc-dev
am: 0fca5f7

* commit '0fca5f75f56f59d68fc6d3a891302efbebd621da':
  Disable stripped-dex test for no-dex2oat.
  Disable stripped-dex test on target.

Change-Id: I82e0183b451dae790a81ee1c200efd777928b082