Merge changes from topic "lshal_pretty" am: 303322f06a am: e1111eb11d

am: 655da33570

Change-Id: I11a78b12e3b20dadb48dc0703e8ac26ba1074867

1 files changed, 2 insertions, 2 deletions

diff --git a/cmds/lshal/TextTable.h b/cmds/lshal/TextTable.h
index 4636f15a27..91d522aef7 100644
--- a/cmds/lshal/TextTable.h
+++ b/cmds/lshal/TextTable.h
@@ -21,8 +21,6 @@
 #include <string>
 #include <vector>
 
-#include "TableEntry.h"
-
 namespace android {
 namespace lshal {
 
@@ -68,6 +66,8 @@ public:
     void add(const std::string& s) { mTable.emplace_back(s); }
     void add(std::string&& s) { mTable.emplace_back(std::move(s)); }
 
+    void addAll(TextTable&& other);
+
     // Prints the table to out, with column widths adjusted appropriately according
     // to the content.
     void dump(std::ostream& out) const;