OSDN Git Service

am 4021117d: Merge "Allow app to stop lockTaskMode if started by manifest attribute...
authorWale Ogunwale <ogunwale@google.com>
Mon, 1 Jun 2015 19:18:20 +0000 (19:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 19:18:20 +0000 (19:18 +0000)
commit320b953417ef8a048ede95ba933046b60c3b7532
tree7abb36ae93df2c2a6848032afa0775f9359e9b86
parent85fe74c3478f6bb1b2e72950697815d1eeadfec3
parent4021117d0a78f89c9c9e5acc0e4d61092952e5f5
am 4021117d: Merge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev

* commit '4021117d0a78f89c9c9e5acc0e4d61092952e5f5':
  Allow app to stop lockTaskMode if started by manifest attribute