Rob Carr dff4323f01 Merge "Preserve non-floating state when entering pinned stack." into oc-dev ...

am: f5b6818009

Change-Id: I22f408fef8007cb5c1266a7115da01c07b4f0eb4

2017-05-15 23:38:21 +00:00

..

java

Merge "Preserve non-floating state when entering pinned stack." into oc-dev

2017-05-15 23:38:21 +00:00

jni

Merge "Require targetSdkVersion>=O for updated graphics driver packages" into oc-dev

2017-05-15 23:15:04 +00:00

proto/android

…

res

Merge "Changed alert window notifications to use single channel" into oc-dev

2017-05-15 22:34:59 +00:00

tests

Merge "Use placeholderCount-1 if using default layout." into oc-dev

2017-05-15 16:45:57 +00:00