tree 51e6bb279f30c794e649c506c6208b65f84f153c
parent a167322e6677f24f6d1be949b3183ac2f8cf1e30
parent ef34053f269058b421881eb1620c4185eade05ef
author Neil Fuller <nfuller@google.com> 1479229477 +0000
committer android-build-merger <android-build-merger@google.com> 1479229477 +0000

Merge "Correctly handle when the user has no explicit time_12_24 setting" am: 8631e19d38 am: 98f03f4980
am: ef34053f26

Change-Id: I3724485cc956b2d5a64a6e71f325181d5fdbcccf