OSDN Git Service

Merge "Use splashscreen if we can't fill horizontaly with snapshot" into oc-dev
authorJorim Jaggi <jjaggi@google.com>
Thu, 15 Jun 2017 04:19:48 +0000 (04:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 15 Jun 2017 04:19:53 +0000 (04:19 +0000)
commit04c3cc6d12012dcb39f8aef9a07143d91328ba77
tree0ccb89a1ddf9cab3fbda5f20f59fcc8ab0116504
parentd9b1697b2da6f0947c2f7635932408c2ae686247
parent42befc64c43377bfcec0e8cfe6fbcb9fdf5f0953
Merge "Use splashscreen if we can't fill horizontaly with snapshot" into oc-dev
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/wm/WindowManagerService.java