am 0c7f6dd9: Merge "Fix couple of instances of undefined behavior"
authorPyry Haulos <phaulos@google.com>
Fri, 29 May 2015 00:29:53 +0000 (00:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 29 May 2015 00:29:53 +0000 (00:29 +0000)
commit5b09ae970d2b109931c43ed4ee04acc445fc579e
tree1d7a41f9b363873893ba7f93da7f3e68878b3cb6
parent30f02fd9300ffa14d9f4ec5aaeb25f086760bfd0
parent0c7f6dd9d24ce0b0076496222a2911c2f458e7c5
am 0c7f6dd9: Merge "Fix couple of instances of undefined behavior"

* commit '0c7f6dd9d24ce0b0076496222a2911c2f458e7c5':
  Fix couple of instances of undefined behavior