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, 19 insertions, 0 deletions

diff --git a/tensorflow/python/kernel_tests/lookup_table_op_test.py b/tensorflow/python/kernel_tests/lookup_table_op_test.py
index cd170876e6..a6b91560f1 100644
--- a/tensorflow/python/kernel_tests/lookup_table_op_test.py
+++ b/tensorflow/python/kernel_tests/lookup_table_op_test.py
@@ -26,6 +26,25 @@ class HashTableOpTest(tf.test.TestCase):
       result = output.eval()
       self.assertAllEqual([0, 1, -1], result)
 
+  def testHashTableFindHighRank(self):
+    with self.test_session():
+      shared_name = ''
+      default_val = -1
+      table = tf.HashTable(tf.string, tf.int64, default_val, shared_name)
+
+      # Initialize with keys and values tensors.
+      keys = tf.constant(['brain', 'salad', 'surgery'])
+      values = tf.constant([0, 1, 2], tf.int64)
+      init = table.initialize_from(keys, values)
+      init.run()
+      self.assertAllEqual(3, table.size().eval())
+
+      input_string = tf.constant([['brain', 'salad'], ['tank', 'tarkus']])
+      output = table.lookup(input_string)
+
+      result = output.eval()
+      self.assertAllEqual([[0, 1], [-1, -1]], result)
+
   def testHashTableInitWithPythonArrays(self):
     with self.test_session():
       shared_name = ''