commit | 2308172769f8e81b295db839a10e69430c5a04d4 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Oct 29 07:47:31 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 29 07:47:31 2020 +0000 |
tree | d5bef725ada9ecb707d5c2a090d05c972967664c | |
parent | 772467cf0e56bf35654f1ec523aeeb091e579046 [diff] | |
parent | 38be0ff3455deb98f566a25669e91db4a9cf0b2b [diff] |
Merge "Replace hidden NMS permission control API" am: d8288fe344 am: 38be0ff345 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473957 Change-Id: I45135311ec026b75d1110614f609b851b72f543b