tree 965b25a1a526622b1091613f7483cb6ed58d321e
parent e7b79f16c1548ba2c40af4452167c64ba442566e
parent ff649c601d0e2caa5d939f09c7183a8a4d8db60b
author Maurice Lam <yukl@google.com> 1421789198 +0000
committer android-build-merger <android-build-merger@google.com> 1421789198 +0000

Merge "[WifiSetup] Don\'t pan the window for IME" into lmp-mr1-dev
automerge: ff649c6

* commit 'ff649c601d0e2caa5d939f09c7183a8a4d8db60b':
  [WifiSetup] Don't pan the window for IME