Jeff Sharkey 12f4b76db2 Merge "Unbreak even more APK 26 apps running on "O" preview/beta builds." into oc-dev am: 997042ac33 ...

am: c244963675

Change-Id: I30e0155a9260ec4099ad45d7161c8459c8b657a2

2017-05-18 16:11:07 +00:00

..

java

Merge "Unbreak even more APK 26 apps running on "O" preview/beta builds." into oc-dev am: 997042ac33

2017-05-18 16:11:07 +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

Remove unused settings.

2017-05-17 18:44:54 +00:00