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:
28fc6a2
5b84ba3
)
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison...
author
Zheng Zhang
<zhzh@google.com>
Wed, 19 Apr 2017 18:26:33 +0000
(18:26 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 19 Apr 2017 18:26:33 +0000
(18:26 +0000)
am:
5b84ba3b15
-s ours
Change-Id: Ic447d9ee4910f467e8ca6dad7d02693846e4fab8
Trivial merge