tree 1e3f4b6b3aceaf8395bb74d0dec8ab8e1bd59a53
parent 0ec8f65a6a4a02324ce362533e7a896797e0c6df
parent e276fd46544b6dcd571ee304b677392e8c131273
author Chiachang Wang <chiachangwang@google.com> 1610534035 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610534035 +0000

Merge "[IT4.21] Update the label type of idle timer" am: 4bdcbf4608 am: bf710b7402 am: e276fd4654

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9445412f619fa8d4d0e7888a333bbdffdca013bf