commit | c423d00016e764dc93e23ddfded95b54e9687b94 | [log] [tgz] |
---|---|---|
author | Neil Fuller <nfuller@google.com> | Tue Nov 15 17:11:40 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Nov 15 17:11:40 2016 +0000 |
tree | 8ea29dd4ae0caf70c6044420761ae74a898fa7ca | |
parent | 5ddd7172b1d60f289ba9fc07cfad0e660b341ee5 [diff] | |
parent | 9103632f9d8c9931e485865057bdfd8ff73a65da [diff] |
Merge "Correctly handle when the user has no explicit time_12_24 setting" am: 8631e19d38 am: 98f03f4980 am: ef34053f26 am: 9103632f9d Change-Id: I3b2b8355d80dca87a09ef97027753bcd568cff14