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:
938d8da
83378cb
)
Merge "Import translations. DO NOT MERGE" into nyc-dev
author
Baligh Uddin
<baligh@google.com>
Sun, 22 May 2016 23:34:29 +0000
(23:34 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Sun, 22 May 2016 23:34:29 +0000
(23:34 +0000)
am:
83378cb136
-s ours
* commit '
83378cb13689fa73be349a9ce4b0802ed64fc935
':
Import translations. DO NOT MERGE
Change-Id: Id406199ec77f14e947db6f7c65a2f3b65795374d
Trivial merge