OSDN Git Service

Merge "Correctly handle when the user has no explicit time_12_24 setting" am: 8631e19d38
authorNeil Fuller <nfuller@google.com>
Tue, 15 Nov 2016 16:57:32 +0000 (16:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 15 Nov 2016 16:57:32 +0000 (16:57 +0000)
am: 98f03f4980

Change-Id: Ia6592370da446e43896fb56d12f734841e137d49


Trivial merge