OSDN Git Service

Merge commit '457e9215df2a8353f484a268950623d714afa01c' into klp-dev-plus-aosp
authorGeoff Mendal <mendal@google.com>
Thu, 20 Feb 2014 22:34:09 +0000 (14:34 -0800)
committerGeoff Mendal <mendal@google.com>
Thu, 20 Feb 2014 22:34:09 +0000 (14:34 -0800)
Conflicts:
res/values-lo-rLA/strings.xml

1  2 
res/values-lo-rLA/strings.xml

Simple merge