tree f205a5790f81350eee48222d836458c256e76488
parent 8d5f3ad3bb0780aea53fe63c9f3a4e5e055b408f
parent 5699f000cb8773c358f1e18affeb2ac91e322ef6
author Sarah Chin <sarahchin@google.com> 1588813381 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588813381 +0000

Merge "Add legacy state to 5g timer configs" am: 5699f000cb

Change-Id: I3efd65adf9b578c75011f8b61dd832243c76c6f5