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

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

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

Change-Id: Ieca8e912713aa966422f49530dfe7bbde4e480ff