Ian Pedowitz 52e33eed24 Merge "Revert "Revert "O is API 26""" into oc-dev am: 655ab3f59b ...

am: b6290ff39e

Change-Id: If4c21c8d37d753b00e4478c21bf5e6dbe9f39288

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

..

java

Merge "Revert "Revert "O is API 26""" into oc-dev am: 655ab3f59b

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

jni

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

2017-05-15 23:23:35 +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 "Revert "Revert "Resource ID fixup.""" into oc-dev am: a11196074b

2017-05-16 05:01:08 +00:00

tests

Merge "Use placeholderCount-1 if using default layout." into oc-dev am: 260d6c6e8c

2017-05-15 16:51:41 +00:00