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:50:29 +0000 (16:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 15 Nov 2016 16:50:29 +0000 (16:50 +0000)
commit98f03f49809e304223ac6e47a245ae9c70dc0e98
treedb5306b05d59582efeb88cf26deff2beea482890
parent30874ed6edd925588d6c6faf056ecb4666af4133
parent8631e19d3883ce6887c09f72eb394f2e22c9cb64
Merge "Correctly handle when the user has no explicit time_12_24 setting"
am: 8631e19d38

Change-Id: I70533c5ff4ac8cdeef1b42337bb47b09c8bbf927
core/java/android/app/ActivityThread.java