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:
066f97e
01afc37
)
If no display settings are matched, return the first one. DO NOT MERGE automerge...
author
Mark Renouf
<mrenouf@google.com>
Tue, 4 Nov 2014 07:15:18 +0000
(07:15 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 4 Nov 2014 07:15:18 +0000
(07:15 +0000)
automerge:
01afc37
-s ours
* commit '
01afc37403a244e75fbfa385b197d76e476213e8
':
Trivial merge