OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0524c3 812ad1a)
am 812ad1aa: (-s ours) am a2ab4fc8: (-s ours) am f88916ca: (-s ours) am 197e7381...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 23:18:13 +0000 (23:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 23:18:13 +0000 (23:18 +0000)
* commit '812ad1aa4e9f0558e800bbc234a278f205b1e8a8':
  Import translations. DO NOT MERGE


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