TreeHugger Robot 284d9401ac Merge "Refactor LockSettingsService to unify the handling of pattern and password"

2017-01-13 19:30:49 +00:00

..

java/com/android/server

Merge "Refactor LockSettingsService to unify the handling of pattern and password"

2017-01-13 19:30:49 +00:00

jni

Merge "Add a callback handler for nanoApp aborts."

2017-01-12 23:50:06 +00:00

Android.mk

resolve merge conflicts of 46c39f6c36 to master

2017-01-11 16:15:13 +00:00