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)
commit9bc59c20d0bc0683c537560ea92c581eeaf1ebe9
treef2cc1c88198ca6fc0a5526eab81b87074d109c46
parenta0010b81ad0e179a8336f84da84f7aed3dd54cb5
parent457e9215df2a8353f484a268950623d714afa01c
Merge commit '457e9215df2a8353f484a268950623d714afa01c' into klp-dev-plus-aosp

Conflicts:
res/values-lo-rLA/strings.xml
res/values-lo-rLA/strings.xml