TensorFlow: upstream changes to git (doc fixes).

Changes:

- Fix typos across several files contributed by Erik Erwitt,
  and Michael R. Berstein

- Fix bug in translate example (fr->en typo) by schuster

- Updates to some documentation (mcoram,shlens,vrv,joshl)

- Fix to Android camera demo app window size detection (andrewharp)

- Fix to support lookup table of high rank tensors (yleon)

- Fix invalid op names for parse_example (dga)

Base CL: 107531031

1 files changed, 1 insertions, 5 deletions

diff --git a/tensorflow/core/kernels/lookup_table_op.cc b/tensorflow/core/kernels/lookup_table_op.cc
index 2bab4df94f..2d647d8ed4 100644
--- a/tensorflow/core/kernels/lookup_table_op.cc
+++ b/tensorflow/core/kernels/lookup_table_op.cc
@@ -109,9 +109,6 @@ class LookupTableFindOp : public OpKernel {
     OP_REQUIRES_OK(ctx, ctx->MatchSignature(expected_inputs, expected_outputs));
 
     const Tensor& input = ctx->input(1);
-    OP_REQUIRES(ctx, TensorShapeUtils::IsVector(input.shape()),
-                errors::InvalidArgument("Input must be a vector, not ",
-                                        input.shape().DebugString()));
 
     const Tensor& default_value = ctx->input(2);
     OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(default_value.shape()),
@@ -119,8 +116,7 @@ class LookupTableFindOp : public OpKernel {
                                         default_value.shape().DebugString()));
 
     Tensor* out;
-    OP_REQUIRES_OK(ctx,
-                   ctx->allocate_output("output_values", input.shape(), &out));
+    OP_REQUIRES_OK(ctx, ctx->allocate_output("values", input.shape(), &out));
 
     OP_REQUIRES_OK(ctx, table->Find(input, out, default_value));
   }