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:
f9bcdc0
c143ad8
)
Merge changes from topic "am-0ee32b8ade9b4288bb89d13c68de291f"
author
Android Build Merger (Role)
<noreply-android-build-merger@google.com>
Fri, 26 Jan 2018 01:05:38 +0000
(
01:05
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 26 Jan 2018 01:05:38 +0000
(
01:05
+0000)
* changes:
Merge changes from topic "am-
8df3bdfc
-9f3c-40b2-b051-
5cc0120da88b
" into oc-dev am:
eb9a92f942
am:
939313310b
am:
6a423ee7ce
am:
91de2d1cd0
[automerger skipped] Import translations. DO NOT MERGE skipped:
816ddbdba7
skipped:
e0e084e199
am:
a9d64326ad
-s ours am:
8a35a13afe
-s ours am:
73f06fe35f
-s ours am:
3450afaf04
-s ours
Trivial merge