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:
e5f29ca
853304c
)
Show work challenge in if user in docked stack is locked
author
Tony Mak
<tonymak@google.com>
Mon, 18 Apr 2016 15:40:41 +0000
(15:40 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 18 Apr 2016 15:40:41 +0000
(15:40 +0000)
am:
853304c
* commit '
853304c0b11921db142a3945ab66fae5f0cc7d8a
':
Show work challenge in if user in docked stack is locked
Change-Id: I6a35ac189e1bbb5fcb2b2ce28d2d2c9300cd82e6
Trivial merge