tree 55ec517952232cf7fad913233acf81c082fe70d8
parent 1a02757bda09d2794e0b0c6090e82b8d82e06e5e
parent a90753b25ce9d5558e30e49dbe2769a52d99658e
author Dmitry Shmidt <dimitrysh@google.com> 1257891804 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257891804 -0800

am a90753b2: am 846ab564: tnetw1251: Add 500 ms expired wakelock to deliver the message (b/2245483)

Merge commit 'a90753b25ce9d5558e30e49dbe2769a52d99658e' into eclair-mr2-plus-aosp

* commit 'a90753b25ce9d5558e30e49dbe2769a52d99658e':
  tnetw1251: Add 500 ms expired wakelock to deliver the message (b/2245483)