OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
85fe74c
4021117
)
am 4021117d: Merge "Allow app to stop lockTaskMode if started by manifest attribute...
author
Wale Ogunwale
<ogunwale@google.com>
Mon, 1 Jun 2015 19:18:20 +0000
(19:18 +0000)
committer
Android 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