summaryrefslogtreecommitdiffstats
path: root/proguard.flags
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-09-13 16:14:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-13 16:14:06 -0700
commit55ea2736f7d2fcaaa64d8db8e8186817def714dd (patch)
tree28fee53fbff291cda13bf6e99d9b2a525271e90e /proguard.flags
parent2e99735046df7dc016a0407d1806b5979cbfc445 (diff)
parent3d83f5ca9cb39a8f000da4c7f163a25108e1f478 (diff)
downloadpackages_apps_Settings-55ea2736f7d2fcaaa64d8db8e8186817def714dd.zip
packages_apps_Settings-55ea2736f7d2fcaaa64d8db8e8186817def714dd.tar.gz
packages_apps_Settings-55ea2736f7d2fcaaa64d8db8e8186817def714dd.tar.bz2
am 3d83f5ca: am caeb7a6e: Merge "Get time zone names from CLDR."
* commit '3d83f5ca9cb39a8f000da4c7f163a25108e1f478': Get time zone names from CLDR.
Diffstat (limited to 'proguard.flags')
0 files changed, 0 insertions, 0 deletions