OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d712843 4cd9be5)
am b145e363: (-s ours) am ba62da99: am fb393f8b: Mark configuration strings as not...
authorEric Fischer <enf@google.com>
Thu, 1 Mar 2012 23:32:22 +0000 (15:32 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Mar 2012 23:32:22 +0000 (15:32 -0800)
* commit 'b145e363ff4e00048cdc9035300a6db05aa0fbb5':
  Mark configuration strings as not translatable.


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