OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9eafb61 89a2b28)
am 89a2b286: (-s ours) am cba2873e: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 4 Mar 2015 13:44:24 +0000 (13:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Mar 2015 13:44:24 +0000 (13:44 +0000)
* commit '89a2b286ae69858a999d050ac30fdf171dee6d1c':
  Import translations. DO NOT MERGE


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