diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-06 16:43:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-06 16:43:46 -0700 |
| commit | 001d14561088a542a5cee605ecff217b180f908b (patch) | |
| tree | 22700eb7c335acaa15344b9276eda5356abc9bf8 /res/values-in-nokeys | |
| parent | 2ec3622a9927681aa90a4ef61cb965354d388790 (diff) | |
| parent | 0c0d605231e78c3a883b88b4abbc46ee29a7a194 (diff) | |
| download | packages_apps_settings-001d14561088a542a5cee605ecff217b180f908b.zip packages_apps_settings-001d14561088a542a5cee605ecff217b180f908b.tar.gz packages_apps_settings-001d14561088a542a5cee605ecff217b180f908b.tar.bz2 | |
am 0c0d6052: am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master
* commit '0c0d605231e78c3a883b88b4abbc46ee29a7a194':
Stop hard-coding sample 12- and 24-hour times.
Diffstat (limited to 'res/values-in-nokeys')
0 files changed, 0 insertions, 0 deletions