tree f2cc1c88198ca6fc0a5526eab81b87074d109c46
parent a0010b81ad0e179a8336f84da84f7aed3dd54cb5
parent 457e9215df2a8353f484a268950623d714afa01c
author Geoff Mendal <mendal@google.com> 1392935649 -0800
committer Geoff Mendal <mendal@google.com> 1392935649 -0800

Merge commit '457e9215df2a8353f484a268950623d714afa01c' into klp-dev-plus-aosp

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