Merge commit '0766b2d0f398dcad10e332b695bbc0cbe5011882' into eclair-mr2-plus-aosp * commit '0766b2d0f398dcad10e332b695bbc0cbe5011882': Update service example code.
Merge commit '0766b2d0f398dcad10e332b695bbc0cbe5011882' into eclair-mr2-plus-aosp * commit '0766b2d0f398dcad10e332b695bbc0cbe5011882': Update service example code.