tree 0d6da90fcbcc6fe2518cd6566facad0fa2fa79b9
parent fbeb17c9ae7de86f47ab958782a38e3de432e04c
parent 26e004398fe6e7b00ab6fce74b128b6426492344
author Peter Collingbourne <pcc@google.com> 1597423695 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597423695 +0000

Merge "Fix a TODO." am: 7bbc03b467 am: 26e004398f

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

Change-Id: I55ce7a0b31564b0e6859e974bef95cc60f43e7d8