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:
cbdecf9
7d8fe60
)
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: a2e1bb8c3e -s ours
author
Bill Yi
<byi@google.com>
Tue, 12 Jul 2016 16:38:15 +0000
(16:38 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 12 Jul 2016 16:38:15 +0000
(16:38 +0000)
am:
7d8fe60299
-s ours
Change-Id: Id36fc37ef69e00b795fee823fd86b1fecb9b6df1
Trivial merge