commit | 6854ee9f796b4eb69c68efbe565ed99a5e55b987 | [log] [tgz] |
---|---|---|
author | The Android Automerger <android-build-merger@google.com> | Tue Jan 09 18:09:27 2018 +0000 |
committer | The Android Automerger <android-build-merger@google.com> | Tue Jan 09 18:09:27 2018 +0000 |
tree | e853df38a4cfac445da5c8c09439d780ca49595b | |
parent | b7698c97bed346b0606bb5b11aba95b5969a800d [diff] | |
parent | a353a9bf2b15050f201fd31315640de8e7665511 [diff] |
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.