Jorim Jaggi bb14173b59 Merge "Take snapshot when screen is turning off" into oc-dev am: 64900ad13c ...

am: 8947e7a215

Change-Id: Ifec8c2e6368e01e47ae2fdf6fecded4a7aa9172e

2017-05-19 12:50:06 +00:00

..

java

Merge "Take snapshot when screen is turning off" into oc-dev am: 64900ad13c

2017-05-19 12:50:06 +00:00

jni

Merge "Avoid a race condition on reading qemu.gles property"

2017-05-18 06:38:06 +00:00

proto/android

Merge "strong fp lockout after 20 failed attempts" into oc-dev am: 310818ff82

2017-05-13 00:03:18 +00:00

res

Merge "Import translations. DO NOT MERGE" into oc-dev

2017-05-18 23:46:48 +00:00

tests

Merge "More unit tests for classes needed in reading uid times per cpu freq." into oc-dev am: aff7c3c71e

2017-05-18 18:06:56 +00:00