OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97a988b ed2f33c)
am ed2f33ce: (-s ours) am 6c15c153: (-s ours) am 99177687: (-s ours) Merge "Revert...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 15:45:57 +0000 (15:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:45:57 +0000 (15:45 +0000)
* commit 'ed2f33ce76eac9b74b9b105bafbc328560b18d57':
  Revert "Import translations. DO NOT MERGE"


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