commit 1796dd2b614b5d4cf543d80dd17cd1c4957e4568
author Steven Moreland <smoreland@google.com> Tue Apr 23 19:05:39 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Apr 23 19:05:39 2019 -0700
tree d484e2945bfd72c23f67d6c2f091dda6f12d2c06
parent 40ed2573ebeeff941a966a856a9685f89c1c1d6c
parent c1e587fb8d7867c4d7bea3d77078aedd9adca2cb

[automerger skipped] Merge "Do not destruct static maps." into qt-dev
am: c1e587fb8d -s ours
am skip reason: change_id I66eb9aa24e31d7fc652f0426361c17600b4716ec with SHA1 b1c7d06b1f is in history

Change-Id: I0dba45ab0e84b510391a4f28c3f796ad63d2eb9d

transport/allocator/1.0/Android.bp

diff --git a/transport/allocator/1.0/Android.bp b/transport/allocator/1.0/Android.bp
index a3d885a..80364a7 100644
--- a/transport/allocator/1.0/Android.bp
+++ b/transport/allocator/1.0/Android.bp
@@ -14,4 +14,3 @@
     ],
     gen_java: false,
 }
-

transport/base/1.0/Android.bp

diff --git a/transport/base/1.0/Android.bp b/transport/base/1.0/Android.bp
index cebb01b..f90831e 100644
--- a/transport/base/1.0/Android.bp
+++ b/transport/base/1.0/Android.bp
@@ -12,4 +12,3 @@
     ],
     gen_java: true,
 }
-

transport/manager/1.0/Android.bp

diff --git a/transport/manager/1.0/Android.bp b/transport/manager/1.0/Android.bp
index 869c58e..c91dcd2 100644
--- a/transport/manager/1.0/Android.bp
+++ b/transport/manager/1.0/Android.bp
@@ -15,4 +15,3 @@
     ],
     gen_java: true,
 }
-

transport/manager/1.1/Android.bp

diff --git a/transport/manager/1.1/Android.bp b/transport/manager/1.1/Android.bp
index 407dfa3..82545e5 100644
--- a/transport/manager/1.1/Android.bp
+++ b/transport/manager/1.1/Android.bp
@@ -15,4 +15,3 @@
     ],
     gen_java: true,
 }
-

transport/manager/1.2/Android.bp

diff --git a/transport/manager/1.2/Android.bp b/transport/manager/1.2/Android.bp
index 3f02f78..e7ee143 100644
--- a/transport/manager/1.2/Android.bp
+++ b/transport/manager/1.2/Android.bp
@@ -17,4 +17,3 @@
     ],
     gen_java: true,
 }
-

transport/memory/1.0/Android.bp

diff --git a/transport/memory/1.0/Android.bp b/transport/memory/1.0/Android.bp
index eaa3037..dd76889 100644
--- a/transport/memory/1.0/Android.bp
+++ b/transport/memory/1.0/Android.bp
@@ -16,4 +16,3 @@
     ],
     gen_java: false,
 }
-

transport/safe_union/1.0/Android.bp

diff --git a/transport/safe_union/1.0/Android.bp b/transport/safe_union/1.0/Android.bp
index 88c7d5d..2760863 100644
--- a/transport/safe_union/1.0/Android.bp
+++ b/transport/safe_union/1.0/Android.bp
@@ -12,4 +12,3 @@
     ],
     gen_java: true,
 }
-

transport/token/1.0/Android.bp

diff --git a/transport/token/1.0/Android.bp b/transport/token/1.0/Android.bp
index c0988cb..28f16f7 100644
--- a/transport/token/1.0/Android.bp
+++ b/transport/token/1.0/Android.bp
@@ -14,4 +14,3 @@
     ],
     gen_java: true,
 }
-