| commit | aaa42e57797db140ead1068dce6340ffd33fa005 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Jan 11 05:51:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 11 05:51:27 2014 +0000 |
| tree | 3a42c6ef70959a6528b2706f06d517cf767ca8db | |
| parent | 03f696e3eb89c0642f9a2b761ff2cfc6af003d16 [diff] | |
| parent | 081559cc5afb6c8f2f9847e1de739f66a5a07a6b [diff] |
am 081559cc: am 514ac2ba: am e311b15c: Merge "Fix c++11 narrowing" * commit '081559cc5afb6c8f2f9847e1de739f66a5a07a6b': Fix c++11 narrowing