am 23392a84: Fix the build.
Merge commit '23392a84bcb961d3fd50142ec40ce6ac6db89018' into gingerbread-plus-aosp * commit '23392a84bcb961d3fd50142ec40ce6ac6db89018': Fix the build.
This commit is contained in:
commit
97d3435086
Merge commit '23392a84bcb961d3fd50142ec40ce6ac6db89018' into gingerbread-plus-aosp * commit '23392a84bcb961d3fd50142ec40ce6ac6db89018': Fix the build.