tree 6d6c4d628077e65c3c949ef71d5d38ee24632b0f
parent a727514f3c907f075b73d22b52db0ade47038a88
parent 8d25751223dabc4a7754c34a597a63ae3c9f156c
author Treehugger Robot <treehugger-gerrit@google.com> 1591726954 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591726954 +0000

Merge "Address comment from aosp/1232197" am: 794e6ba285 am: a87d030207 am: d471a80425 am: 8d25751223

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

Change-Id: Ida4e4b34b59d501e906b4c86dec9e2a8d494639c