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:
6033ab6
2800f22
)
Merge "Properly compute default and system set flag on an upgrade" into oc-dev am...
author
Svetoslav Ganov
<svetoslavganov@google.com>
Thu, 17 Aug 2017 02:44:01 +0000
(
02:44
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 17 Aug 2017 02:44:01 +0000
(
02:44
+0000)
am:
2800f22eec
-s ours
Change-Id: I767ece0ec5b60ef92da2e6ebe394bdcf2e966328
Trivial merge