tree d9952e4b345db5cac8eaae2a094979e4a4808e9e
parent e573aca07b35722ab924da55c0b81f8d974281c0
parent 1ca2a4b1bb5ab2f2be9e0d4e43fc23e6eaee0498
author Agatha Man <agathaman@google.com> 1603831418 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603831418 +0000

Merge "Remove accidentally added diff file" into rvc-qpr-dev am: 1ca2a4b1bb

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

Change-Id: I375480141afff06a4cfd51508857fa754e839097