OSDN Git Service

am e311b15c: Merge "Fix c++11 narrowing"
authorNick Kralevich <nnk@google.com>
Sat, 11 Jan 2014 04:25:46 +0000 (20:25 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 11 Jan 2014 04:25:46 +0000 (20:25 -0800)
commit514ac2bae9fc32327cac3ba22c4862e8b5ef259e
treed777d2a54e0fb1654fe81e186b0168ddf4c1f857
parentd8d45edf6a2714fff051d67aa1ac83d74bb0c6e0
parente311b15cf821f65f68af2cdfe01e864cbc9a86ce
am e311b15c: Merge "Fix c++11 narrowing"

* commit 'e311b15cf821f65f68af2cdfe01e864cbc9a86ce':
  Fix c++11 narrowing