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:
45dcce7
7afbfd7
)
Merge "Cherry-pick 'Add @Nullable annotations to getOperatorAlphaLong and getOperator...
author
Cassie
<xih@google.com>
Wed, 21 Mar 2018 04:49:27 +0000
(
04:49
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 21 Mar 2018 04:49:27 +0000
(
04:49
+0000)
am:
7afbfd7a9c
-s ours
Change-Id: I8307585f3b8ca64ec3c48ef84546963f965943ff
Trivial merge