diff options
author | Maurice Lam <yukl@google.com> | 2015-01-20 21:49:49 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-20 21:49:49 +0000 |
commit | 50f2081f6bebfa68669e8363baa036da468e9e9b (patch) | |
tree | 67e131fd896fc3d68b6debb5bec4a844cd0d305c /res | |
parent | f3428e435e9eaf9d8ff6857fe77e08d4846caef2 (diff) | |
parent | 1cca45bc6e12a04ce6bde0e5b1c56933869cf9d8 (diff) | |
download | packages_apps_Settings-50f2081f6bebfa68669e8363baa036da468e9e9b.zip packages_apps_Settings-50f2081f6bebfa68669e8363baa036da468e9e9b.tar.gz packages_apps_Settings-50f2081f6bebfa68669e8363baa036da468e9e9b.tar.bz2 |
am 1cca45bc: Merge "[WifiSetup] Don\'t pan the window for IME" into lmp-mr1-dev automerge: ff649c6 automerge: a1f6660
* commit '1cca45bc6e12a04ce6bde0e5b1c56933869cf9d8':
[WifiSetup] Don't pan the window for IME
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions