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:
5cca76e
86f7155
)
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
author
Bill Yi
<byi@google.com>
Tue, 12 Jul 2016 16:27:41 +0000
(16:27 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 12 Jul 2016 16:27:41 +0000
(16:27 +0000)
am:
86f7155e6f
-s ours
Change-Id: I93d1e66cc995a91f51bca4bb2aaf42554170a527
Trivial merge