Benjamin Miller 1bb5a1e5b3 Merge "Docs: Javadoc comment fixups for secure passcode reset methods." into oc-mr1-dev am: 947528607f ...

am: 96d506af85

Change-Id: I67da9e4d4a2500d08b0db58f1bff5ad793e3a852

2017-08-16 18:29:38 +00:00

..

java

Merge "Docs: Javadoc comment fixups for secure passcode reset methods." into oc-mr1-dev am: 947528607f

2017-08-16 18:29:38 +00:00

jni

Merge "Support multiple languages per font in fonts.xml"

2017-08-11 23:27:50 +00:00

proto/android

Update WindowManager to output dumpsys in protobuf format

2017-08-14 17:06:17 -07:00

res

Merge "Add privileged permission for reading the current wallpaper image" into oc-mr1-dev am: 4b7b5a6c59

2017-08-16 17:15:08 +00:00

tests

Merge "Fixed coretest DisabledTest"

2017-08-16 17:40:52 +00:00