tree cce475da18028b5fe1aaca0aa16d9716472277dc
parent 0e9dd3b008536fe8a116eb6821ff84d34dba9f71
parent 51cefb2ef58e18acad800c9aa63c2a7eee4d9731
author Android (Google) Code Review <android-gerrit@google.com> 1248121869 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1248121869 -0700

am 51cefb2e: Merge change 7889 into donut

Merge commit '51cefb2ef58e18acad800c9aa63c2a7eee4d9731'

* commit '51cefb2ef58e18acad800c9aa63c2a7eee4d9731':
  Ignore unneeded soft keyboard in ACTV height calc