Merge "Fix couple of implicit conversion warnings reported by MSVC"
authorPyry Haulos <phaulos@google.com>
Tue, 3 Feb 2015 19:33:29 +0000 (19:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 3 Feb 2015 19:33:30 +0000 (19:33 +0000)
commit2c0395d690eb3806d8c20968564a5c1be97b5cd1
treef6fb7080cdfb8f63e54ffb0abfef36de9f8f9c8c
parent5f78b1323b6ef28d8b9cdce6fefcbbb61a0477a9
parent7d6ad9e003b52cfc23626b216b7580babf423c8f
Merge "Fix couple of implicit conversion warnings reported by MSVC"