Kevin Chyn 3164bf6743 Merge "Add assist gesture silence and wake settings" into oc-dr1-dev ...

am: 6eacc1a4ba

Change-Id: I16bac560e1ef3c20830f4bc79dca772da20032e7

2017-06-14 01:53:02 +00:00

..

java

Merge "Add assist gesture silence and wake settings" into oc-dr1-dev

2017-06-14 01:53:02 +00:00

jni

Merge "Binder: Add more logging on Error" into oc-dev

2017-06-13 21:12:33 +00:00

proto/android

Prune unused static libs and instant apps if space needed am: f36d53cbfc

2017-05-31 03:59:35 +00:00

res

Merge "Protect broadcast used in settings for bond cancel" into oc-dev

2017-06-13 01:04:55 +00:00

tests

Copy smearing method to BatteryStatsHelper

2017-06-09 21:15:56 +00:00