summaryrefslogtreecommitdiff
path: root/include/ScopedJavaUnicodeString.h
diff options
context:
space:
mode:
authorTina Zhou <tinazh@google.com>2016-11-16 19:37:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-11-16 19:37:42 +0000
commite804e3897dd5e7eb170c3113dfdb1bce5e0cf92f (patch)
treed09caa65f27c7c5a1605e7d9af616dd8f5cf34f2 /include/ScopedJavaUnicodeString.h
parent3fbcf8af6d4da266c1c4e966f199b31faf3d82c4 (diff)
parent6bb2a718c6436849ee021af055cc757b98be0be1 (diff)
Merge "Merge "CertificateTest: explicitly set validity check date" into lollipop-mr1-cts-dev am: 348c01550a" into marshmallow-cts-dev
am: 6bb2a718c6 Change-Id: I102ab8f51d1ecc631b162ab96c4b5398fb233d66
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions