tree ec628640dcb3cb92a0651124e6b5fd1e3cfa53f0
parent 51ac5ce545ea800ca8378767a5d7ab17bb6bc884
parent d6c6745b2e071847e91b5de4a493c612457561c7
author Qiwen Zhao <zhao@google.com> 1392422677 -0800
committer Qiwen Zhao <zhao@google.com> 1392422677 -0800

Merge commit 'd5c6745b' into klp-dev-plus-aosp

Conflicts:
	res/values-ar/strings.xml
	res/values-de/strings.xml
	res/values-fa/strings.xml
	res/values-iw/strings.xml