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:
1265a3d
ef30f73
)
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 9fe4ca37b9 ...
author
Bill Yi
<byi@google.com>
Fri, 20 Oct 2017 16:34:35 +0000
(16:34 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 20 Oct 2017 16:34:35 +0000
(16:34 +0000)
am:
ef30f73d5a
-s ours
Change-Id: Id60b39fadb55f2a8e38d5c803cb88df5e0def573
Trivial merge