OSDN Git Service

am 8b5c2e8a: am d168d184: Merge "Align the behaviour of different lock task modes...
authorBenjamin Franz <bfranz@google.com>
Thu, 11 Jun 2015 16:38:36 +0000 (16:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Jun 2015 16:38:36 +0000 (16:38 +0000)
commit95b555fc90bcf73723aaee7757fc5aafd84adec4
treedec7fd73156cb6fbb073efcf42ebbb6b844a0edd
parent1714a0eb54e074ac7d87517d666dc2c25780ff95
parent8b5c2e8acd01c87204ba0b842a35c625be174e5b
am 8b5c2e8a: am d168d184: Merge "Align the behaviour of different lock task modes" into mnc-dev

* commit '8b5c2e8acd01c87204ba0b842a35c625be174e5b':
  Align the behaviour of different lock task modes
services/core/java/com/android/server/am/ActivityManagerService.java