Steven Moreland d0ea5528fe Merge "SurfaceTexture.cpp: use proper nativehelper headers" into oc-dev-plus-aosp ...

am: 124acec8ad

Change-Id: I1b9f55ed3661a440b89a7820bf4d1b9c66f240af

2017-07-29 20:06:25 +00:00

..

java

Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev

2017-07-28 23:54:05 +00:00

jni

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

2017-07-29 20:06:25 +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-dr1-dev

2017-07-28 23:10:01 +00:00

tests

Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev

2017-07-25 02:19:18 +00:00