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:
c91d861
4ea85eb
)
Merge changes from topic "am-1e00ca1a840d4d319db537c2c1612f26"
author
Android Build Merger (Role)
<noreply-android-build-merger@google.com>
Fri, 26 Jan 2018 01:12:25 +0000
(
01:12
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 26 Jan 2018 01:12:25 +0000
(
01:12
+0000)
* changes:
Merge changes from topic "am-
8df06f4c
-7127-41db-a6a2-
64c67bb75497
" into oc-dev am:
6367f8199d
am:
f1d0f9652c
am:
33e2d30f87
am:
e95f894e67
[automerger skipped] Import translations. DO NOT MERGE skipped:
aa7eca2f03
skipped:
ccc16f92d7
am:
387047a201
-s ours am:
f12ba9fee4
-s ours am:
3c2c04a47d
-s ours am:
ab6b536629
-s ours
Trivial merge