Geoffrey Pitsch d536ba3f41 Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev ...

am: 861b35e1df

Change-Id: Ib0c2a708e2556fc604631891666b70a841a1129a

2017-08-01 14:09:10 +00:00

..

java

Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev

2017-08-01 14:09:10 +00:00

jni

Merge "Update for less arguments in hidl toBinder." into oc-mr1-dev

2017-07-24 21:23:38 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

2017-07-21 15:51:32 +00:00

res

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

2017-08-01 07:58:07 +00:00

tests

Added setIdleConnectionTimeout method

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