OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 046e38b a1243ac)
am a1243ac6: (-s ours) am e438183d: (-s ours) am 29932d13: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 17:26:49 +0000 (17:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 17:26:49 +0000 (17:26 +0000)
* commit 'a1243ac690b5f07ee1cba9bad71dfffd6f6eb2a6':
  Import translations. DO NOT MERGE


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