summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2015-01-20 21:49:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-20 21:49:49 +0000
commit50f2081f6bebfa68669e8363baa036da468e9e9b (patch)
tree67e131fd896fc3d68b6debb5bec4a844cd0d305c /tests
parentf3428e435e9eaf9d8ff6857fe77e08d4846caef2 (diff)
parent1cca45bc6e12a04ce6bde0e5b1c56933869cf9d8 (diff)
downloadpackages_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 'tests')
0 files changed, 0 insertions, 0 deletions