tree 7707bbf99a269f52d043eeefebf9d3258f450a90
parent 4417caa02c0611051b79a52d7a26f1e21c0598d1
parent 4ded5d511ec0691dd3e97e6ee6647edd73780e7a
author Brad Ebinger <breadley@google.com> 1602544539 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602544539 +0000

[automerger skipped] Merge "Add READ_PRIVILEGED_PHONE_STATE to TestApi" am: d70fa41860 am: 8c9d627fa3 am: 70c45b45b4 am: 4ded5d511e -s ours

am skip reason: Change-Id I67520ba9f8bf25b759f6552a332bdebf67f4c7e6 with SHA-1 ca12f926c0 is in history

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

Change-Id: Ida0a4a604b212d12fe02aa2c9c0f9c8a8d8d43f9