Commits
repo sync authored and Android Git Automerger committed c0f2d9522eaM
am 0b7d6de1: Fix the build. Merge commit '0b7d6de1559a4a78af76ab501e0a15afc396c2b9' into gingerbread-plus-aosp * commit '0b7d6de1559a4a78af76ab501e0a15afc396c2b9': Fix the build.
Showing diff to2b6528554e4