tree 723bf52398e0212734fd2be0b9609a1e40dcbc1c
parent 4f8da93bf7cd5f2bd0768a7a5cd05411d031171f
parent 8e2744538cfc0d1b85ba3ff9ccc2defd965fdeaa
author Hall Liu <hallliu@google.com> 1588889819 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588889819 +0000

[automerger skipped] Merge "Add sound or vibration effect for network-initiated USSD" into rvc-dev am: 9ced392f48 -s ours am: 8e2744538c -s ours

am skip reason: Change-Id Ib08d7a30db64020e0393bb9d12ec2ce4b51651cb with SHA-1 e450cdc447 is in history

Change-Id: I2d8cb9d4d7595f274f0dd4dafe41477a8dc89c5d