tree c1de301e59289ee9ac3fa95516624c3c03ce507c
parent e22e25fe80cff914e71273901f343e663d9ea471
parent bbefc88e86aabd2bf9e37a8485066fef3a50efd2
author Nick Pelly <npelly@google.com> 1287983799 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287983799 -0700

am d6abaf32: am 145550a0: Merge "Document getPollBytes() and getActivationBytes()." into gingerbread

Merge commit 'd6abaf326ba4e0ff342cf28a828b75a334beba69'

* commit 'd6abaf326ba4e0ff342cf28a828b75a334beba69':
  Document getPollBytes() and getActivationBytes().