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:
a5532c9
db8b369
)
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 60858a45cd -s...
author
Bill Yi
<byi@google.com>
Thu, 21 Jul 2016 03:48:12 +0000
(
03:48
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 21 Jul 2016 03:48:12 +0000
(
03:48
+0000)
am:
db8b36970c
-s ours
Change-Id: I14d90c58dc1d04ac5ffc48ec92e015dfeae37f3c
Trivial merge