OSDN Git Service

Merge "Correctly handle when the user has no explicit time_12_24 setting"
authorNeil Fuller <nfuller@google.com>
Tue, 15 Nov 2016 16:39:42 +0000 (16:39 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 15 Nov 2016 16:39:42 +0000 (16:39 +0000)

Trivial merge