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:
54d4693
779722d
)
Merge "Import translations. DO NOT MERGE" into nyc-dev
author
Bill Yi
<byi@google.com>
Mon, 25 Apr 2016 15:15:42 +0000
(15:15 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 25 Apr 2016 15:15:42 +0000
(15:15 +0000)
am:
779722d
-s ours
* commit '
779722d7ed84aa0d7a03a3aec93690de9c3dcb7c
':
Import translations. DO NOT MERGE
Change-Id: I39eea7741f07a090ee8aa03919c5456b68a01b5f
Trivial merge