Dave Mankoff f62794fab9 Merge "Allow BrightLineFalsingManager settings to be experimented with via Phenotype." into qt-dev ...

am: 8d56bbf2e3

Change-Id: I02f776454972a2b96744c02bad1de3b9e24e689c

2019-07-24 12:28:42 -07:00

..

java

Merge "Allow BrightLineFalsingManager settings to be experimented with via Phenotype." into qt-dev

2019-07-24 12:28:42 -07:00

jni

Categorize [anon:stack_and_tls:{}] as stack memory

2019-07-23 02:06:38 +00:00

proto

Merge "Remove ro.url.legal* props from proto" am: c4fdd9ac1d

2019-06-28 09:06:17 -07:00

res

Merge "Fix permission javadoc about whitelisting." into qt-dev

2019-07-23 10:57:03 -07:00

tests

resolve merge conflicts of 9acd72c60b to stage-aosp-master

2019-07-22 09:29:24 +00:00

xsd

…