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:
868e7bf
9aa4c09
)
Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 721249f22b -s ours
author
Geoff Mendal
<mendal@google.com>
Wed, 21 Oct 2015 17:16:22 +0000
(17:16 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 21 Oct 2015 17:16:22 +0000
(17:16 +0000)
am:
9aa4c094c1
-s ours
* commit '
9aa4c094c1b5271629d6736a8533e0a234ee2d9d
':
Import translations. DO NOT MERGE
Trivial merge