OSDN Git Service

am 0f486a6e: am 320b9534: am 4021117d: Merge "Allow app to stop lockTaskMode if start...
authorWale Ogunwale <ogunwale@google.com>
Mon, 1 Jun 2015 19:41:45 +0000 (19:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 19:41:45 +0000 (19:41 +0000)
commita8df7a9047c1324312c361a5364f4a8dcaae1611
treea7fb82ae116fb2d193448e89fbe1bc4ca8eb99d9
parent5113e8012959accf18b95ab7766d3bbf30b06865
parent0f486a6e380a851c4d28039c4616eb7baf39ac0d
am 0f486a6e: am 320b9534: am 4021117d: Merge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev

* commit '0f486a6e380a851c4d28039c4616eb7baf39ac0d':
  Allow app to stop lockTaskMode if started by manifest attribute
services/core/java/com/android/server/am/ActivityManagerService.java