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:
67ae5a2
ef29899
)
Merge "Import translations. DO NOT MERGE" into nyc-dev
author
Bill Yi
<byi@google.com>
Fri, 3 Jun 2016 17:04:02 +0000
(17:04 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 3 Jun 2016 17:04:02 +0000
(17:04 +0000)
am:
ef2989920d
-s ours
* commit '
ef2989920d00f19d5dcd86bd521eec86bc058754
':
Import translations. DO NOT MERGE
Change-Id: I4c4da499fab8a30733235849a336876442e46125
Trivial merge