OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3dc2f0a e30f773)
am e30f773c: (-s ours) am 060b2ce9: (-s ours) am e7961129: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 15:45:46 +0000 (15:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:45:46 +0000 (15:45 +0000)
* commit 'e30f773ca54de3616cd1eeb935c871b60268b3c7':
  Import translations. DO NOT MERGE


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