tree 96226ddee497fb27b25451434507bdfa79ff43c1
parent 00424c7e16fac524bfb5a5b232ea4d68e59dbba4
parent bb3903675c81ec22222aaf4ad1b65b7f3eedee03
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