Merge "Enhance Chronometer to better support Swedish countdowns." into oc-dev

author Aurimas Liutikas <aurimas@google.com>

Mon, 17 Apr 2017 20:21:25 +0000 (20:21 +0000)

committer android-build-merger <android-build-merger@google.com>

Mon, 17 Apr 2017 20:21:25 +0000 (20:21 +0000)
author Aurimas Liutikas <aurimas@google.com>
Mon, 17 Apr 2017 20:21:25 +0000 (20:21 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 17 Apr 2017 20:21:25 +0000 (20:21 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Aurimas Liutikas <aurimas@google.com>
	Mon, 17 Apr 2017 20:21:25 +0000 (20:21 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 17 Apr 2017 20:21:25 +0000 (20:21 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history