415c6cb2358a0ad4821ec58c287b1de94de78d72
8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev
* commit '8c8387d235b780c4a78a54d8240fe1f5a17c6af5': "I tried to think of the most harmless thing."
am
9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev
…
am
ac5f9628: am 7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev
am
4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%