am d3d6a8ac: Merge "Fix MSVC warning about shift operator precedence"
authorPyry Haulos <phaulos@google.com>
Fri, 22 May 2015 20:45:29 +0000 (20:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 20:45:29 +0000 (20:45 +0000)
* commit 'd3d6a8ac35e3e7a62fa23493205bd6d81091d289':
  Fix MSVC warning about shift operator precedence


Trivial merge