Manually fastforward platform/cts.

platform/cts shoves too many changes at one into automerger and it slows everyone else down. Manually merging everything in platform/cts that needs to be merged to unblock other things.
This commit is contained in:
The Android Automerger
2018-01-09 18:09:27 +00:00

Diff Content Not Available