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)
* commit '4021117d0a78f89c9c9e5acc0e4d61092952e5f5':
  Allow app to stop lockTaskMode if started by manifest attribute


Trivial merge