Siarhei Vishniakou 305fe47d65 Merge "Revive DeadZone" into oc-dev ...

am: b278424fa6

Change-Id: I5a06302eaad1e955aaea6ae8d2785c0b12e53cc4

2017-06-19 23:59:46 +00:00

..

java

Merge "Revive DeadZone" into oc-dev

2017-06-19 23:59:46 +00:00

jni

Merge "AudioService: implement safe volume warning for USB Headsets" into oc-dr1-dev

2017-06-18 05:15:38 +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

Import translations. DO NOT MERGE

2017-06-16 18:39:16 -07:00

tests

Merge changes from topic 'battery_smear_move' into oc-dev

2017-06-09 20:50:47 +00:00