OSDN Git Service

am 1a907db0: am 862c3835: am 4b60a8d1: Merge "Added check of ActivityInfo launch...
authorDianne Hackborn <hackbod@android.com>
Thu, 30 Aug 2012 23:04:19 +0000 (16:04 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Aug 2012 23:04:19 +0000 (16:04 -0700)
commitb2dd4e87ae8ac6a0402b7a0ed37201f27bcb1b9c
tree0a851d3b9e7dd8c1f41404e4be2eb34e679ad98f
parent0fa814d7e6d16e68fa715175cf3122b19fd9e59c
parent1a907db07ea105ea65e146713f436ed072d7084b
am 1a907db0: am 862c3835: am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity."

* commit '1a907db07ea105ea65e146713f436ed072d7084b':
  Added check of ActivityInfo launch mode when starting activity.
services/java/com/android/server/am/ActivityStack.java