Fyodor Kupolov 8fa408caae Merge "List column names in the error message" into oc-mr1-dev ...

am: 2729912a35

Change-Id: Ia477660fdee2f94f042d0c3d463481ee550abd56

2017-08-01 00:45:33 +00:00

..

java

Merge "List column names in the error message" into oc-mr1-dev

2017-08-01 00:45:33 +00:00

jni

Merge "SurfaceTexture.cpp: use proper nativehelper headers" into oc-dev-plus-aosp am: 124acec8ad

2017-07-29 20:14:27 +00:00

proto/android

…

res

Merge "Added setIdleConnectionTimeout method" into oc-mr1-dev

2017-08-01 00:06:04 +00:00

tests

Added setIdleConnectionTimeout method

2017-07-31 11:05:57 -07:00