OSDN Git Service

Merge "Merge commit '270226b0' into manualmerge" into klp-dev
authorWink Saville <wink@google.com>
Thu, 29 Aug 2013 22:10:51 +0000 (22:10 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 29 Aug 2013 22:10:52 +0000 (22:10 +0000)
1  2 
core/res/res/values/config.xml
core/res/res/values/symbols.xml

Simple merge
Simple merge