OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12249bf 36fc6a8)
am 36fc6a88: (-s ours) am 57103ebf: (-s ours) am df55ecbf: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 15:45:35 +0000 (15:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:45:35 +0000 (15:45 +0000)
* commit '36fc6a88d266ae18151971d390d5e7c9b6d91f55':
  Import translations. DO NOT MERGE


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