tree 37dddfedb87a69ecfb3160f06d8bc24ca47f1f1a
parent b18a7c3ef1ff92ee2b8407743ffc4d7fd8b8ba70
parent 4ac4ab4ef046eed4d1ada7bbb1d54ee0a244d454
author Xia Wang <xiaw@google.com> 1326333218 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326333218 -0800

am 4ac4ab4e: Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1

* commit '4ac4ab4ef046eed4d1ada7bbb1d54ee0a244d454':
  Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922