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:
8d1f3f6
972b902
)
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
author
Bill Yi
<byi@google.com>
Thu, 9 Jun 2016 14:22:06 +0000
(14:22 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 9 Jun 2016 14:22:06 +0000
(14:22 +0000)
am:
972b902171
-s ours
Change-Id: I83cbeb9a2398fdecc3f45f108e25258a53448bcd
Trivial merge