summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBen Komalo <benkomalo@google.com>2011-06-02 17:28:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-02 17:28:25 -0700
commit657a7ad8b279c7a5bbda47c92961a6fbc7473b0b (patch)
tree64379918b76fb5ea90af8911ff1870f6cc4f164f /src
parent1334d7fc3a3a1fd2f48aed93d9344115d674fcc2 (diff)
parent1e43e694ae0822426d4759aa2d5192cbe5d15d63 (diff)
downloadpackages_apps_settings-657a7ad8b279c7a5bbda47c92961a6fbc7473b0b.zip
packages_apps_settings-657a7ad8b279c7a5bbda47c92961a6fbc7473b0b.tar.gz
packages_apps_settings-657a7ad8b279c7a5bbda47c92961a6fbc7473b0b.tar.bz2
am 1e43e694: am 57b17f50: Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2
* commit '1e43e694ae0822426d4759aa2d5192cbe5d15d63': Fix cryptkeeper UI for 7" tablets.
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions