From b704857c919ba5b804ffc07501f3011252885e7a Mon Sep 17 00:00:00 2001
From: Sadaf Ebrahimi <sadafebrahimi@google.com>
Date: Tue, 12 Jul 2022 19:55:09 +0000
Subject: Escaping double quotes inside the JSON quoted string

Test: treehugger
Change-Id: I1299943244c9530ef6f706ebbd66df2f213ab675
---
 METADATA | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/METADATA b/METADATA
index 91d28eb0..0d45b52d 100644
--- a/METADATA
+++ b/METADATA
@@ -1,6 +1,6 @@
 name: "jackson-core"
 description:
-    "This project contains core low-level incremental ("streaming") parser and "
+    "This project contains core low-level incremental (\"streaming\") parser and "
     "generator abstractions used by Jackson Data Processor. It also includes "
     "the default implementation of handler types (parser, generator) that "
     "handle JSON format. The core abstractions are not JSON specific, although "
-- 
cgit v1.2.3


From 2a67855fa4bcae0c6097600b6de6a37bb8c71596 Mon Sep 17 00:00:00 2001
From: Frank Feng <frankfeng@google.com>
Date: Wed, 15 Mar 2023 19:00:39 -0700
Subject: Pin tradefed dependencies to Java 11

Bug: 267831518
Test: TH
Change-Id: Ie5af57bd97ddd5fe64069319b465965f945cfb5e
---
 Android.bp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Android.bp b/Android.bp
index 2eb0b830..fb286b9d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,4 +37,6 @@ java_library_host {
         "android/src/**/*.java",
         "src/main/**/*.java",
     ],
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
 }
-- 
cgit v1.2.3