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:
0ae03ae
2983b83
)
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 4316b8a -s ours
author
Bill Yi
<byi@google.com>
Mon, 25 Apr 2016 15:27:01 +0000
(15:27 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 25 Apr 2016 15:27:01 +0000
(15:27 +0000)
am:
2983b83
-s ours
* commit '
2983b837fad0f3573e38522a7ebdce4b76543f8d
':
Change-Id: I0978be5ef9d6f23499170fb6a493886aad5d6026
Trivial merge