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