Merge branch 'security-aosp-tm-release' into int/13/fp3

* security-aosp-tm-release:
  Fix use-after-free in DNS64 discovery thread

Change-Id: Ib4c126d6f78f959b80cbc45811045202db295698
diff --git a/apex/manifest.json b/apex/manifest.json
index 005c02f..d7da79c 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.resolv",
-  "version": 339990000
+  "version": 330400000
 }