tree ddbb48c98a0a43517d97e2493e64bd40c08a7f71
parent 99cbdb2fc0e6f5ecaaa26637fe2aa1ef776247e1
parent a9667afd6d731ed82b426ac66f03a73a6b8a6cbb
author Sarah Chin <sarahchin@google.com> 1582157178 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1582157178 +0000

Merge changes from topics "revert-10153355-dev_cap-JUKVIAUYRW", "revert-9919494-device_cap-HJIMIMXSXL"

* changes:
  Revert "Modify PhoneCapabilities for device capabilities"
  Revert "PhoneCapability cleanup"