tree c3f7b6bda200951ea4adfdde8bd41a58bcf2664a
parent ec3aad2e30ead7923f659c197c57f843cc55c913
parent 8fa85d2025902d15f40edff3255d99422685d9de
author Qiwen Zhao <zhao@google.com> 1392423770 -0800
committer Qiwen Zhao <zhao@google.com> 1392423770 -0800

Merge commit '8fa85d20' into klp-dev-plus-aosp

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