tree 121459e2daaeb05eeba2bd660747d479cb15bc7f
parent 66f7bc4e825b25d4ebde9de97c6ae57305f5da13
parent c3040bbc3d837d2a18546ac551379026ebd874ce
author Treehugger Robot <treehugger-gerrit@google.com> 1612377680 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612377680 +0000

[automerger skipped] Merge "Limited use key: feature files" am: 63e30d9a38 am: 1fb7c54d17 am: c3040bbc3d -s ours

am skip reason: Change-Id I33349c4f968fa7b16055acd3db2e0cb80c0c5df1 with SHA-1 0538ddc49b is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1552236

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24bcd2bc61abfde9a1fa1694db890a1c98a3bdd3