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:
481fbe6
d6cbc60
)
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 2c697884a3 ...
author
Bill Yi
<byi@google.com>
Sun, 2 Apr 2017 09:17:29 +0000
(09:17 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Sun, 2 Apr 2017 09:17:29 +0000
(09:17 +0000)
am:
d6cbc60edc
-s ours
Change-Id: I6d4593dd6e87a4da1518ee4ef397b3872c58660e
Trivial merge