Jorim Jaggi 6d79f45783 Merge "Crashing can not override Keyguard transit" into pi-dev ...

am: 44121059dc

Change-Id: Ieb020e920e1417d501f12bf7b5c2c57437685d9c

2018-06-05 04:46:46 -07:00

..

java

Merge "Crashing can not override Keyguard transit" into pi-dev

2018-06-05 04:46:46 -07:00

jni

Merge "Camera: fix off by one error" into pi-dev

2018-06-04 13:51:59 -07:00

proto

Merge "Added TestApi to ActivityInfo.isTranslucentOrFloating" into pi-dev

2018-05-26 02:23:25 +00:00

res

Import translations. DO NOT MERGE

2018-06-03 03:27:06 -07:00

tests

Merge "WindowInsets: Never dispatch negative insets" into pi-dev

2018-05-28 07:51:31 -07:00