Vinay Kalia 56768fcd28 Merge "Fix BLE scan leaks" into oc-dr1-dev am: 604a4b7171 am: 7d06d7bd79 ...

am: 0fc48f2d37

Change-Id: I4952bd5792d1c7d62ff7bf1ac3be9166b794ce49

2017-07-29 22:32:32 +00:00

..

java

Merge "Fix BLE scan leaks" into oc-dr1-dev am: 604a4b7171 am: 7d06d7bd79

2017-07-29 22:32:32 +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 "Import translations. DO NOT MERGE" into oc-dr1-dev

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

tests

Merge "Remove secondary bidi cursor"

2017-07-27 23:58:07 +00:00