tree 06105d1b79da1140461d5c5c66feb666f61faf4b
parent 0bd33fb9461755d13763e4b92f32f192ec9cbff1
parent c06dc8bace15d35fda791a4f4544a17979a3a170
author Sarah Chin <sarahchin@google.com> 1580233084 -0800
committer android-build-merger <android-build-merger@google.com> 1580233084 -0800

Merge "Modify PhoneCapabilities for device capabilities"
am: c06dc8bace

Change-Id: I9a6c7d7c9b99c20d7b61dba2b67c10959cc582a7