am 7ed999aa: (-s ours) am c4aa4ff3: am 810b0d8b: Merge "Fix build problems with gcc-4.6.x."
* commit '7ed999aaf00a71d99975a4a068ba2562c0aabc88': Fix build problems with gcc-4.6.x.
This commit is contained in:
commit
73e6923ed2
* commit '7ed999aaf00a71d99975a4a068ba2562c0aabc88': Fix build problems with gcc-4.6.x.