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