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:
ffb489e
89a7e99
)
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison...
author
Zheng Zhang
<zhzh@google.com>
Thu, 20 Apr 2017 00:16:18 +0000
(
00:16
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 20 Apr 2017 00:16:18 +0000
(
00:16
+0000)
am:
89a7e998f1
-s ours
Change-Id: I4784b330048232799eb839cff00ca6e04dab5ecc
Trivial merge