| commit | ef34053f269058b421881eb1620c4185eade05ef | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Tue Nov 15 16:57:32 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 15 16:57:32 2016 +0000 |
| tree | b3dab7cafe1530e8730f26b6c6e02f9faa4efced | |
| parent | 0a5b88e286f556b8e54d3e806ecbaeb5bb385fbc [diff] | |
| parent | 98f03f49809e304223ac6e47a245ae9c70dc0e98 [diff] |
Merge "Correctly handle when the user has no explicit time_12_24 setting" am: 8631e19d38 am: 98f03f4980 Change-Id: Ia6592370da446e43896fb56d12f734841e137d49