Alan Viverette 4b7d3642c7 Merge "Only change picker modes when used in dialog" into nyc-dev am: be58946330 ...

am: e6eee3dd41

* commit 'e6eee3dd41fd72aa847cde84c6465bc5ed917e14':
  Only change picker modes when used in dialog

Change-Id: Iaf2386ea6fc15b5ce734710325aabbb85c91583d

2016-04-29 16:43:02 +00:00

..

java

Merge "Maintain internal consistency for TimePickerClockDelegate hour" into nyc-dev

2016-04-29 15:24:45 +00:00

jni

resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp

2016-04-28 12:08:15 -07:00

res

Merge "Only change picker modes when used in dialog" into nyc-dev am: be58946330

2016-04-29 16:43:02 +00:00

tests

Merge "Ensure local settings caches are not stale" into nyc-dev

2016-04-26 18:47:52 +00:00