Remove TensorShape::ShortDebugString in favor of TensorShape::DebugString

The two functions already have the same behavior.
Change: 112959229

RELEASE.md

@@ -22,6 +22,9 @@
     * `tensor_shape.h` -> `../framework/tensor_shape.h`
     * `partial_tensor_shape.h` -> `../framework/partial_tensor_shape.h`
     * `tensorflow_server.h` deleted
+* For C++ API users: `TensorShape::ShortDebugString` has been renamed to
+  `DebugString`, and the previous `DebugString` behavior is gone (it was
+  needlessly verbose and produced a confusing empty string for scalars).
 
 
 ## Bug fixes

google/protobuf

@@ -1 +1 @@
-Subproject commit 014b9012d32c6409bf2f4f13ff4608a2cbc7cb9a
+Subproject commit 60f7fc51fb01ac98fd64d9372e7547f5ab267ce5

tensorflow/core/framework/tensor_shape.h

@@ -125,20 +125,10 @@ class TensorShape {
   /// For error messages.
   string DebugString() const;
 
-  /// Same as DebugString()
-  string ShortDebugString() const { return DebugString(); }
-  // TODO(irving): Remove, used to be different but isn't now.
-
   /// Same as `TensorShape(proto).DebugString()` but doesn't crash for
   /// invalid protos.
   static string DebugString(const TensorShapeProto& proto);
 
-  /// Same as DebugString()
-  static string ShortDebugString(const TensorShapeProto& proto) {
-    return DebugString(proto);
-  }
-  // TODO(irving): Remove in favor of DebugString
-
  private:
   // Recalculates the dimensions of this tensor after they are modified.
   void recompute_dims();

tensorflow/examples/android/BUILD

@@ -1,7 +1,13 @@
 # Description:
 #   Tensorflow camera demo app for Android.
 
-package(default_visibility = ["//visibility:public"])
+package(
+    default_visibility = ["//visibility:public"],
+    features = [
+        "-layering_check",
+        "-parse_headers",
+    ],
+)
 
 licenses(["notice"])  # Apache 2.0