diff options
| author | Daniel Xie <dxie@google.com> | 2016-01-21 00:11:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-21 00:11:07 +0000 |
| commit | 96ff0d492eb48c945d1842bf3a60fa7130f8e8db (patch) | |
| tree | 83c3c8e0d8ce17a6ee816a7efdb950e8ac55a072 /include/ScopedJavaUnicodeString.h | |
| parent | 4188eb12da70da4751b33dd26010d5bf04460393 (diff) | |
| parent | 75d2bbcc0d56e14a8bbb158a8319363138f26c99 (diff) | |
Merge "Allow some rounding on SO_TIMEOUT values" into marshmallow-cts-dev am: 83c293c477 am: 3f9db209e5
am: 75d2bbcc0d
* commit '75d2bbcc0d56e14a8bbb158a8319363138f26c99':
Allow some rounding on SO_TIMEOUT values
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions