Skip to content
Commit 8fb0b7d8 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge changes from topics "deactivate_no_tds", "deactivate_no_tds_revert" am: 82bb853f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2057051



Change-Id: I6977d244cdea18367a586b8aa15a7d274d96c238
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dd57fd99 82bb853f
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment