tree 9b206f1df497facef94e01a850cc3c1ac8f12f8b
parent a207bdf4bcbfd6b833d7dac54e514bcd8cd0fe53
parent 58b8f2ff517e16c279e12c6a057237f399f2c872
author Nick Pelly <npelly@google.com> 1287983512 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287983512 -0700

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

Merge commit '145550a00ea59ff20133acc95315e463628e16db' into gingerbread-plus-aosp

* commit '145550a00ea59ff20133acc95315e463628e16db':
  Document getPollBytes() and getActivationBytes().