Adrian Roos 6281d64277 Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev ...

am: f04714c59a

Change-Id: I38bab1ff56a30cccb2f748588ffbbe54d5e17e80

2018-06-04 10:02:32 -07:00

..

java

Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev

2018-06-04 10:02:32 -07:00

jni

Merge "Throw OOME if Bitmap.nativeCreate fails" into oc-dev

2017-10-31 20:29:00 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

2017-07-21 15:51:32 +00:00

res

[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e

2018-04-09 20:17:15 +00:00

tests

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into oc-dev

2018-02-01 23:44:18 +00:00