OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0eb2f89 5a4b32f)
am 6f020e24: Merge "resolved conflicts for merge of 4b48ce8f to lmp-dev-plus-aosp...
authorRobert Greenwalt <rgreenwalt@google.com>
Thu, 21 Aug 2014 03:34:36 +0000 (03:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 Aug 2014 03:34:36 +0000 (03:34 +0000)
* commit '6f020e24ff8263295f79b232899870db443da3c1':
  Mark configuration strings as non-translatable.


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