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