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:
03797f0
97360f9
)
Merge "Import translations. DO NOT MERGE" into nyc-dev
author
Baligh Uddin
<baligh@google.com>
Sun, 22 May 2016 23:32:20 +0000
(23:32 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Sun, 22 May 2016 23:32:20 +0000
(23:32 +0000)
am:
97360f90ce
-s ours
* commit '
97360f90ce2015f56b860692dabe0aa82786a888
':
Import translations. DO NOT MERGE
Change-Id: I0cb6ae304f8c8980d5c3f78773e20aa354a02940
Trivial merge