| commit | 081559cc5afb6c8f2f9847e1de739f66a5a07a6b | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Jan 11 05:48:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 11 05:48:40 2014 +0000 |
| tree | d777d2a54e0fb1654fe81e186b0168ddf4c1f857 | |
| parent | 0ba9f9b07d47e9e6b374798f397fe961256a6029 [diff] | |
| parent | 514ac2bae9fc32327cac3ba22c4862e8b5ef259e [diff] |
am 514ac2ba: am e311b15c: Merge "Fix c++11 narrowing" * commit '514ac2bae9fc32327cac3ba22c4862e8b5ef259e': Fix c++11 narrowing