| commit | 514ac2bae9fc32327cac3ba22c4862e8b5ef259e | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Jan 10 20:25:46 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 10 20:25:46 2014 -0800 |
| tree | d777d2a54e0fb1654fe81e186b0168ddf4c1f857 | |
| parent | d8d45edf6a2714fff051d67aa1ac83d74bb0c6e0 [diff] | |
| parent | e311b15cf821f65f68af2cdfe01e864cbc9a86ce [diff] |
am e311b15c: Merge "Fix c++11 narrowing" * commit 'e311b15cf821f65f68af2cdfe01e864cbc9a86ce': Fix c++11 narrowing