Dianne Hackborn 0785389f81 Merge "Add documentation on oneway transaction ordering." into oc-mr1-dev am: 0b8f281637 ...

am: dae5beb369

Change-Id: Ib82d76693497fd08f293d523edb5f84fb14bc815

2017-08-01 02:49:33 +00:00

..

java

Merge "Add documentation on oneway transaction ordering." into oc-mr1-dev am: 0b8f281637

2017-08-01 02:49:33 +00:00

jni

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

2017-07-29 20:22:26 +00:00

proto/android

Merge "Settings: Remove SamplingProfiler vestiges"

2017-07-25 22:43:18 +00:00

res

Merge changes from topic 'am-6888cf31d8e14dab98bec7df0b9168c6' into oc-mr1-dev-plus-aosp

2017-08-01 00:59:41 +00:00

tests

Merge "Added setIdleConnectionTimeout method" into oc-mr1-dev am: 82f289a4b4

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