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