summaryrefslogtreecommitdiff
path: root/include/ScopedJavaUnicodeString.h
diff options
context:
space:
mode:
authorDaniel Xie <dxie@google.com>2015-12-03 01:27:26 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-12-03 01:27:26 +0000
commit0730bd1afdb33005daa26cd7b032c057cb9698f5 (patch)
tree422e84ce70c6882898a2eeae1fcb166f8435e05d /include/ScopedJavaUnicodeString.h
parent6de5831683acc64e2ca5efa61fae6834314d0eb2 (diff)
parent79810ceebb071f7a52999783de2a3a529071bb93 (diff)
Merge "Fix time calculation in test_SSLSession_getLastAccessedTime" into marshmallow-cts-dev
am: 79810ceebb * commit '79810ceebb071f7a52999783de2a3a529071bb93': Fix time calculation in test_SSLSession_getLastAccessedTime
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions