Vinay Kalia b7e2c50214 Merge "Fix BLE scan leaks" into oc-dr1-dev ...

am: 604a4b7171

Change-Id: I65e4990a08cc59ce30ee6d987f13a0381b42e58f

2017-07-29 22:17:06 +00:00

..

java

Merge "Fix BLE scan leaks" into oc-dr1-dev

2017-07-29 22:17:06 +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