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:
61d0e73
f25fae7
)
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 84c67fa304 -s ours
author
Bill Yi
<byi@google.com>
Tue, 12 Jul 2016 16:38:11 +0000
(16:38 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 12 Jul 2016 16:38:11 +0000
(16:38 +0000)
am:
f25fae7ea5
-s ours
Change-Id: I83d520d76aa9e4a285fc8b67cb14f7cb4e107fd6
Trivial merge