summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/ZonePicker.java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2013-09-12 11:26:22 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-12 11:26:22 -0700
commit6489d6f6547f5eb96d9a675ba68fa241ab699b42 (patch)
tree802928f60284cc7132d34f8114b1b5bbe4fdb037 /src/com/android/settings/ZonePicker.java
parent32aa0bfdd5984970e22da9676c5f59cc0bf9203e (diff)
parent54fa990f6174542e1e7fbe77a75954fcd2f39983 (diff)
downloadpackages_apps_Settings-6489d6f6547f5eb96d9a675ba68fa241ab699b42.zip
packages_apps_Settings-6489d6f6547f5eb96d9a675ba68fa241ab699b42.tar.gz
packages_apps_Settings-6489d6f6547f5eb96d9a675ba68fa241ab699b42.tar.bz2
am 54fa990f: Merge "Fix manifest entry for CAPTIONING_SETTINGS action" into klp-dev
* commit '54fa990f6174542e1e7fbe77a75954fcd2f39983': Fix manifest entry for CAPTIONING_SETTINGS action
Diffstat (limited to 'src/com/android/settings/ZonePicker.java')
0 files changed, 0 insertions, 0 deletions