summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/OwnerInfoSettings.java
diff options
context:
space:
mode:
authorJustin Ho <justinho@google.com>2012-01-20 14:42:33 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-20 14:42:33 -0800
commit1fea43224ce3b84e248d9e49b8597fe58351db65 (patch)
tree7e4515a52086b8671a378e95e906864e1574c6af /src/com/android/settings/OwnerInfoSettings.java
parentcf3f7abbeb9a31e73ef41b3f6512ebb095ac9e90 (diff)
parent43c9dcc18e4e1137c59b847eadde7ae27302b08f (diff)
downloadpackages_apps_settings-1fea43224ce3b84e248d9e49b8597fe58351db65.zip
packages_apps_settings-1fea43224ce3b84e248d9e49b8597fe58351db65.tar.gz
packages_apps_settings-1fea43224ce3b84e248d9e49b8597fe58351db65.tar.bz2
am 43c9dcc1: Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1
* commit '43c9dcc18e4e1137c59b847eadde7ae27302b08f': Fix a pseudo race condition in TtsEngineSettingsFragment.
Diffstat (limited to 'src/com/android/settings/OwnerInfoSettings.java')
0 files changed, 0 insertions, 0 deletions