Sam Hasinoff 98ded07bd5 Merge "Fix bad pixel out-of-bounds filter" into pi-dev am: c3a7ab321b ...

am: e98cc4ad37

Change-Id: Id1fdc09dd05d93f83557d121decc338f10202410

2018-04-23 13:43:43 -07:00

..

java

Merge "ViewRoot: Check Surface validity before initializing renderer from draw()." into pi-dev am: cef96f69d7

2018-04-23 13:07:12 -07:00

jni

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

2018-04-23 13:43:43 -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 "Global actions visuals:" into pi-dev am: a52c08a7af

2018-04-23 12:50:11 -07:00

tests

Merge "Update Emoji.java for emoji 11" into pi-dev

2018-04-23 11:53:25 -07:00