tree 73eda2eebeb02f3d2b9487cc79a6e619e276d675
parent 9b056e55cc5e5fff89183173b5fda55f52a2af37
parent 46724ffbb8ef9adb59e3b3f72ce0e1a10e93e47d
author Sooraj Sasindran <sasindran@google.com> 1604359109 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604359109 +0000

[automerger skipped] Support api to control data by thermal service am: 2675c0b418 am: cbd89ff475 am: 1d0f36e7cd am: 46724ffbb8 -s ours

am skip reason: Change-Id I3cdab9b04fb3033a7df64c82d2f911febf721c6d with SHA-1 4872c7f0bc is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1480718

Change-Id: I313ae951f6fc1324e9165fcd502d4bbc3e04167b