Andreas Gampe bae0bb191e Merge "Frameworks: In the kill handler, ensure the logging handler was run" am: c0ac9e916f ...

am: c9740fb393

Change-Id: Ie65982c54312c3eb854a4e663fe7bd0ff22c92c5

2018-04-03 13:41:25 -07:00

..

java

Merge "Frameworks: In the kill handler, ensure the logging handler was run" am: c0ac9e916f

2018-04-03 13:41:25 -07:00

jni

Merge "Expose the JNI scrypt function in a standalone Java class so we can use it in RecoverableKeyStore as well" into pi-dev

2018-04-02 20:36:36 -07:00

proto

Disabling print dumping for now.

2018-04-02 15:03:28 -07:00

res

Merge "Move forward the alarm timestamp when config is added to statsd." into pi-dev

2018-04-03 11:27:50 -07:00

tests

Merge "Don't finish activity on duplicate resume request" into pi-dev

2018-04-02 22:58:26 +00:00