Lucas Dupin 22ef7b6356 Merge "Renamed config_dozeAfterScreenOff" into pi-dev ...

am: 425812c8b4

Change-Id: Idbcdb70caeddd08db6246ea79d554aa8fb65bf54

2018-03-21 18:52:23 +00:00

..

java

Merge "Category message is sufficient for message notif" into pi-dev

2018-03-21 18:31:47 +00:00

jni

Merge "Report native allocation size of AnimatedImageDrawable" into pi-dev

2018-03-21 16:48:19 +00:00

proto

Add SoundTriggerDetectionService

2018-03-21 06:00:01 +00:00

res

Merge "Renamed config_dozeAfterScreenOff" into pi-dev

2018-03-21 18:52:23 +00:00

tests

Add SoundTriggerDetectionService

2018-03-21 06:00:01 +00:00