Jean-Michel Trivi 900699c173 Merge "Merge "Fix alarm preview volume" into oc-mr1-dev am: b9629cd432" into oc-mr1-dev-plus-aosp ...

am: fd77afd548

Change-Id: I9ed6b346f9f81a338169628d9e2c955421560744

2017-10-11 22:28:57 +00:00

..

java

Merge "Merge "Fix alarm preview volume" into oc-mr1-dev am: b9629cd432" into oc-mr1-dev-plus-aosp

2017-10-11 22:28:57 +00:00

jni

Merge "EventLogHelper: Clean up code" am: 386a5687dd am: 9b24969314 am: 6f42d696df

2017-10-11 16:28:26 +00:00

proto/android

incidentd: Dumping batterystats system data to proto.

2017-10-09 14:29:40 -07:00

res

Merge "Import translations. DO NOT MERGE"

2017-10-11 19:52:02 +00:00

tests

Merge "Attribute UNKNOWN display state to OFF"

2017-10-11 17:36:03 +00:00