Lucas Dupin 4aff70df64 Merge "AOD clock and notification animation" into pi-dev ...

am: 22db17a97a

Change-Id: I4060191b2adc0ee0b9cd6aeee96a90ac09243c6b

2018-04-28 02:03:45 -07:00

..

java

Merge "FloatingActionMode.setOutsideTouchable" into pi-dev

2018-04-27 13:10:06 -07:00

jni

Merge "Fix bad pixel out-of-bounds filter" into pi-dev

2018-04-23 13:32:11 -07:00

proto

Merge "Add setting for GNSS location request update duration" into pi-dev

2018-04-18 18:10:04 +00:00

res

Merge "AOD clock and notification animation" into pi-dev

2018-04-28 02:03:45 -07:00

tests

Merge "FloatingActionMode.setOutsideTouchable" into pi-dev

2018-04-27 13:10:06 -07:00