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:
6478b4f
b1a0a57
)
Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting chang...
author
Winson Chung
<winsonc@google.com>
Tue, 13 Jan 2015 18:25:06 +0000
(18:25 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 13 Jan 2015 18:25:06 +0000
(18:25 +0000)
automerge:
b1a0a57
-s ours
* commit '
b1a0a57ccab94e479087b620dcea2b39225693bb
':
DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes.
Trivial merge