DO NOT MERGE revert CTS integration build changes am: 62875f6b9f -s ours am: 38cac33...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 17:24:07 +0000 (17:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:24:07 +0000 (17:24 +0000)
commitc7127139ac4ac991168e19c8af336f17ca33ae09
tree8bc17e860ab661811a94fecb77156bb2e4fd602a
parent23d6085f0816dabe8995808eaccb57d80de88355
parent464564dd4a33e248a0a5e74158a3afb60c5bc913
DO NOT MERGE revert CTS integration build changes am: 62875f6b9f  -s ours am: 38cac339a5  -s ours am: 15a29b8c84 am: c11c115754  -s ours
am: 464564dd4a  -s ours

Change-Id: I1e1dbefc3c15c4b5d36874a35c26b4f72675191f