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)

Trivial merge