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:
165a9c3
a03869b
)
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 12af7eb3ab...
author
Bill Yi
<byi@google.com>
Fri, 17 Jun 2016 21:26:57 +0000
(21:26 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 17 Jun 2016 21:26:57 +0000
(21:26 +0000)
am:
a03869b296
-s ours
Change-Id: I98ab1b5e5cea8124c59a99007610b6c8ec809762
Trivial merge