Merge commit '1d62c7737c33f92e79f0a180b05969f52484e64c' into gingerbread-plus-aosp * commit '1d62c7737c33f92e79f0a180b05969f52484e64c': Fix the build
Merge commit '1d62c7737c33f92e79f0a180b05969f52484e64c' into gingerbread-plus-aosp * commit '1d62c7737c33f92e79f0a180b05969f52484e64c': Fix the build