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:
be8b90e
c4af25b
)
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: c4a5178d66...
author
Bill Yi
<byi@google.com>
Fri, 17 Jun 2016 21:10:57 +0000
(21:10 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 17 Jun 2016 21:10:57 +0000
(21:10 +0000)
am:
c4af25b743
-s ours
Change-Id: If444bfcd4e85965c3b594e555930aa3a4fb4ae96
Trivial merge