Merge "Fix a typo in NumberPicker javadoc."

author Brian Duff <bduff@google.com>

Thu, 3 Jul 2014 06:05:07 +0000 (06:05 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Wed, 2 Jul 2014 20:51:20 +0000 (20:51 +0000)
author Brian Duff <bduff@google.com>
Thu, 3 Jul 2014 06:05:07 +0000 (06:05 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 2 Jul 2014 20:51:20 +0000 (20:51 +0000)
diff --cc core/java/android/widget/NumberPicker.java
Simple merge
author	Brian Duff <bduff@google.com>
	Thu, 3 Jul 2014 06:05:07 +0000 (06:05 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 2 Jul 2014 20:51:20 +0000 (20:51 +0000)