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:
564210a
41a1d11
)
Merge "Import translations. DO NOT MERGE" into nyc-dev
author
Baligh Uddin
<baligh@google.com>
Sun, 22 May 2016 23:34:32 +0000
(23:34 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Sun, 22 May 2016 23:34:32 +0000
(23:34 +0000)
am:
41a1d11f98
-s ours
* commit '
41a1d11f98d170ed41935d35fc1a3ed4af2c59fd
':
Import translations. DO NOT MERGE
Change-Id: Iff3f171fe3e678cfa9c16b2d01b87e4d5e949eeb
Trivial merge