DO NOT MERGE revert CTS integration build changes am: 62875f6b9f -s ours am: 38cac33...
authorPyry Haulos <phaulos@google.com>
Wed, 27 Jul 2016 01:33:33 +0000 (01:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jul 2016 01:33:33 +0000 (01:33 +0000)
commitc11c11575443ad5602f56eea35aa114255a1e591
tree323977010fc891f8ff6137e29543466ca7c674f2
parent496c09f666b89d872ef7bd82215a2162085e06f2
parent15a29b8c84fac00b4ffc49693a096180bc486ff6
DO NOT MERGE revert CTS integration build changes am: 62875f6b9f  -s ours am: 38cac339a5  -s ours
am: 15a29b8c84

Change-Id: I3004ecf49b768501d65ca3a9620a624e391689fa