OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
50fc983
ea7411b
)
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: 2898f37...
author
Geoff Mendal
<mendal@google.com>
Wed, 21 Jan 2015 15:08:37 +0000
(15:08 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 21 Jan 2015 15:08:37 +0000
(15:08 +0000)
automerge:
ea7411b
-s ours
* commit '
ea7411bde612a87a5fddf5084110c84211dee34d
':
Import translations. DO NOT MERGE
Trivial merge