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:
08adffa
dd11387
)
Merge "Import translations. DO NOT MERGE" into nyc-dev am: b6a186c -s ours am: 00e13...
author
Bill Yi
<byi@google.com>
Mon, 25 Apr 2016 15:26:55 +0000
(15:26 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 25 Apr 2016 15:26:55 +0000
(15:26 +0000)
am:
dd11387d
-s ours
* commit '
dd11387dd1dc662c73763935afd1c1d496e12222
':
Import translations. DO NOT MERGE
Change-Id: Ib91ba6485fbb071c811c811778f371a12cac6558
Trivial merge