tree 4415c5f53f47656f060f1488cf27db7e1b44024e
parent fa92c58e91f8a25b94f9304768939da66fa007f2
parent 47b6df128ea7bc7809dfca1958eb42258761b533
author Alan Viverette <alanv@google.com> 1461943778 +0000
committer android-build-merger <android-build-merger@google.com> 1461943778 +0000

Merge "Maintain internal consistency for TimePickerClockDelegate hour" into nyc-dev am: 7544ac22e4
am: 47b6df128e

* commit '47b6df128ea7bc7809dfca1958eb42258761b533':

Change-Id: I0a63e16a8c6dd1721110f6a5b5792e262f8a6fa0