Roozbeh Pournader 609aaf52dc Merge "In onDragEvent(), don't assume text is Spannable" into oc-dev am: 99e620ef32 ...

am: c9affff74c

Change-Id: I3501e9a7174b5e1ab8a9486710de515a605f5eb7

2017-05-18 19:42:51 +00:00

..

java

Merge "In onDragEvent(), don't assume text is Spannable" into oc-dev am: 99e620ef32

2017-05-18 19:42:51 +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 "Optimize latency when unlocking phone" into oc-dev

2017-05-18 02:03:40 +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