tree eed4a9120b10d6c3f96f042a21f5c61e2ce9e942
parent 327f4ca24b0434921d62e3d0ba195f05bd408c26
parent 833f141b219fd2da1f90120608dcaad13fa57159
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580233611 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580233611 +0000

[automerger skipped] Merge "Modify PhoneCapabilities for device capabilities" am: c06dc8bace am: e77ddcd34c am: 833f141b21 -s ours
am skip reason: Change-Id I9f5312606b1dc5fc8bd25569f194475be2e20a95 with SHA-1 0605abf494 is in history

Change-Id: I32f8694251761513e4c3f223a64c2eaf2b9028fe