Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml
	build/scripts/tests.gant

Change-Id: I9a1fe25b61f1004e0f62419a5f64e1452644b784

1 files changed, 21 insertions, 0 deletions

diff --git a/xml/impl/src/org/jetbrains/io/fastCgi/FastCgiResponse.java b/xml/impl/src/org/jetbrains/io/fastCgi/FastCgiResponse.java
new file mode 100644
index 000000000000..e249f7152c7c
--- /dev/null
+++ b/xml/impl/src/org/jetbrains/io/fastCgi/FastCgiResponse.java
@@ -0,0 +1,21 @@
+package org.jetbrains.io.fastCgi;
+
+import io.netty.buffer.ByteBuf;
+
+public class FastCgiResponse {
+  private final int id;
+  private final ByteBuf data;
+
+  public FastCgiResponse(int id, ByteBuf data) {
+    this.id = id;
+    this.data = data;
+  }
+
+  public ByteBuf getData() {
+    return data;
+  }
+
+  public int getId() {
+    return id;
+  }
+}
\ No newline at end of file