Svet Ganov c4996bd89c Merge "Fixes crash (race cond) when using toast that is immediately cancelled" into oc-dev ...

am: 2df0155a97

Change-Id: I6cb947b8c42298c7cff1932031faec362b99a354

2017-05-16 14:26:00 +00:00

..

java

Merge "Fixes crash (race cond) when using toast that is immediately cancelled" into oc-dev

2017-05-16 14:26:00 +00:00

jni

Merge "Require targetSdkVersion>=O for updated graphics driver packages" into oc-dev

2017-05-15 23:15:04 +00:00

proto/android

strong fp lockout after 20 failed attempts

2017-05-12 13:01:01 -07:00

res

Merge "Revert "Revert "Resource ID fixup.""" into oc-dev

2017-05-16 04:00:05 +00:00

tests

Merge "Use placeholderCount-1 if using default layout." into oc-dev

2017-05-15 16:45:57 +00:00