OSDN Git Service

am 6dffeb9e: am 8890013a: Merge "Add null check to embeddedAllowed check" into klp...
authorCraig Mautner <cmautner@google.com>
Mon, 5 May 2014 21:03:30 +0000 (21:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 May 2014 21:03:30 +0000 (21:03 +0000)
commitb12646210f15b7f1b7cf0b1cbc56f5cb4bbfe02d
tree6b3dc0e1c2c4a325ffe7bd644427a8b1509a0df0
parent81850c48fd4fe1cb59c752cdfb4c81307631a46b
parent6dffeb9eeba785dcf738bfabfec334a6c188d104
am 6dffeb9e: am 8890013a: Merge "Add null check to embeddedAllowed check" into klp-modular-dev

* commit '6dffeb9eeba785dcf738bfabfec334a6c188d104':
  Add null check to embeddedAllowed check
services/core/java/com/android/server/am/ActivityStackSupervisor.java