tree 85ebbd4d55265463c8bfec8a3df0c4a9d9ed9c62
parent cbc012a6f4bab9d591ad40d037728239c6d47a6f
parent 4b9ed092263007b2c437d26e1b59eb2771bea07e
author Sarah Chin <sarahchin@google.com> 1641415719 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641415719 +0000

Merge "Add Constants for UsageSetting" am: 569fbec7ef am: 4b9ed09226

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

Change-Id: I1b1c121966cc15fe8df4e6b19367cb54a892655f