OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d695da aee4a86)
am aee4a86a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
authorGeoff Mendal <mendal@google.com>
Wed, 25 Feb 2015 17:12:00 +0000 (17:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Feb 2015 17:12:00 +0000 (17:12 +0000)
* commit 'aee4a86a049c8c427a5b5f2d0d8ab0e6be520f00':
  Import translations. DO NOT MERGE


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help