[automerger skipped] Merge "Adding native flag namespace for lmkd." am: 1fdacf6376 am: eb10acc1cb -s ours am: 5c822bf4ea -s ours am: 7bae7d81cf -s ours
am skip reason: Merged-In I1f13d6bbb4a9a7fd8825d7e5acde416750271df4 with SHA-1 93c48c704a is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1786787
Change-Id: I5ecc27e18d3b68206aac38e4dae92486382690cc
This commit is contained in:
committed by
Automerger Merge Worker
commit
de467dd600