tree 48392e0a14019e584a0dc38c9fa1f2c25c9aab01
parent 1f18fde6d07d315217ba373287acb3713d57e631
parent bf85462494a38e9beebad9309c91732b7dcfc679
author Meng Wang <mewan@google.com> 1597782821 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597782821 +0000

[automerger skipped] Merge "Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID" am: 5c8e5ca313 am: f5997ba830 am: aabfda3787 am: 1fc9d9db6a am: bf85462494 -s ours

am skip reason: Change-Id I917085cf6f962c7f5cc7088e2e5298597f661514 with SHA-1 6e39f4af67 is in history

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

Change-Id: Ie132a430a2c80842f9954308221b2535a6a59a03