am 798006e4: (-s ours) am ad3f86a5: Merge "Fixed x86 GCC 4.6 compilation error...
am 798006e4: (-s ours) am ad3f86a5: Merge "Fixed x86 GCC 4.6 compilation error about unused variable"
* commit '798006e4':
Fixed x86 GCC 4.6 compilation error about unused variable