DO NOT MERGE revert CTS integration build changes am: 62875f6b9f -s ours
authorPyry Haulos <phaulos@google.com>
Wed, 27 Jul 2016 01:29:12 +0000 (01:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jul 2016 01:29:12 +0000 (01:29 +0000)
commit15a29b8c84fac00b4ffc49693a096180bc486ff6
tree323977010fc891f8ff6137e29543466ca7c674f2
parent0a50a55ba5ba44bddbe20551a9ae6e921790e418
parent38cac339a5087a019b03a368dbff721e7b9fcdcd
DO NOT MERGE revert CTS integration build changes am: 62875f6b9f  -s ours
am: 38cac339a5  -s ours

Change-Id: I129d3c7c230e9ab6f189fc1bdd6b165021fd420d