Merge commit '056ade1ba976eed5f9b3139ee96b9eb3a26f6283' into eclair-plus-aosp * commit '056ade1ba976eed5f9b3139ee96b9eb3a26f6283': Tighten up sample code.
Merge commit '056ade1ba976eed5f9b3139ee96b9eb3a26f6283' into eclair-plus-aosp * commit '056ade1ba976eed5f9b3139ee96b9eb3a26f6283': Tighten up sample code.