OSDN Git Service

am 320b9534: am 4021117d: Merge "Allow app to stop lockTaskMode if started by manifes...
authorWale Ogunwale <ogunwale@google.com>
Mon, 1 Jun 2015 19:29:10 +0000 (19:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 19:29:10 +0000 (19:29 +0000)
commit0f486a6e380a851c4d28039c4616eb7baf39ac0d
treed6944cd146da45f8902b32c10faec812422359e6
parent7098fae3ad514e21e03fad2fb560e49007598abd
parent320b953417ef8a048ede95ba933046b60c3b7532
am 320b9534: am 4021117d: Merge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev

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