diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-06 16:39:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-06 16:39:41 -0700 |
| commit | 105d879ccef2517a07a15f29b956be739504fa73 (patch) | |
| tree | 580839c1603e5ea4675e148dde980af03b95e167 /res/xml-sk | |
| parent | d4e216bc9eb9b8aecd031a5f3c2a412857333a99 (diff) | |
| parent | 98d9380a5c3c6a6bfa5687af993ea43c882226b9 (diff) | |
| download | packages_apps_settings-105d879ccef2517a07a15f29b956be739504fa73.zip packages_apps_settings-105d879ccef2517a07a15f29b956be739504fa73.tar.gz packages_apps_settings-105d879ccef2517a07a15f29b956be739504fa73.tar.bz2 | |
am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master
* commit '98d9380a5c3c6a6bfa5687af993ea43c882226b9':
Stop hard-coding sample 12- and 24-hour times.
Diffstat (limited to 'res/xml-sk')
0 files changed, 0 insertions, 0 deletions