Commits
Romain Guy authored and Android Git Automerger committed 9a5c6e4f56eM
am 18ef3725: DO NOT MERGE. Fix the build. Merge commit '18ef37258d897928c68b89535a93b99d8a817d3c' into gingerbread-plus-aosp * commit '18ef37258d897928c68b89535a93b99d8a817d3c': DO NOT MERGE. Fix the build.
Showing diff tod88e0680edd