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:
4e6e279
2dc7e09
)
Merge "Revert "Import translations. DO NOT MERGE"" into oc-dr1-dev
author
Bill Yi
<byi@google.com>
Wed, 16 Aug 2017 21:02:20 +0000
(21:02 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 16 Aug 2017 21:02:20 +0000
(21:02 +0000)
am:
2dc7e093b4
-s ours
Change-Id: I0dfea4c7aafd2b62aa5f57a643c952ef89b2f2e9
Trivial merge