Robert Carr e64d0028ae Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev ...

am: 48ed8aa4d0

Change-Id: Ibee1aea584f3e4141806aad6c8e7a592ccc31503

2017-08-03 12:53:40 +00:00

..

java

Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev

2017-08-03 12:53:40 +00:00

jni

Merge "zygote: always log process exit reason." am: b14694b043 am: 1453059ae3

2017-08-02 22:22: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-dr1-dev

2017-08-03 00:12:34 +00:00

tests

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

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