diff options
| author | 2016-11-15 16:57:32 +0000 | |
|---|---|---|
| committer | 2016-11-15 16:57:32 +0000 | |
| commit | ef34053f269058b421881eb1620c4185eade05ef (patch) | |
| tree | b3dab7cafe1530e8730f26b6c6e02f9faa4efced /libs/androidfw/AssetManager.cpp | |
| parent | 0a5b88e286f556b8e54d3e806ecbaeb5bb385fbc (diff) | |
| parent | 98f03f49809e304223ac6e47a245ae9c70dc0e98 (diff) | |
Merge "Correctly handle when the user has no explicit time_12_24 setting" am: 8631e19d38
am: 98f03f4980
Change-Id: Ia6592370da446e43896fb56d12f734841e137d49
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions