Run gendocs

Change: 114328737

5 files changed, 7 insertions, 27 deletions

diff --git a/google/protobuf b/google/protobuf
-Subproject bc215089ca7d9da3a2b313b250d1dee665eda43
+Subproject 028d59fccda7a94c3fd39095261caceb77456af
diff --git a/tensorflow/g3doc/api_docs/python/framework.md b/tensorflow/g3doc/api_docs/python/framework.md
index 5573e5505f..d5485ae0b7 100644
--- a/tensorflow/g3doc/api_docs/python/framework.md
+++ b/tensorflow/g3doc/api_docs/python/framework.md
@@ -1700,6 +1700,9 @@ The following standard keys are defined:
   for more details.
 * `REGULARIZATION_LOSSES`: regularization losses collected during graph
   construction.
+* `WEIGHTS`: weights inside neural network layers
+* `BIASES`: biases inside neural network layers
+* `ACTIVATIONS`: activations of neural network layers
 
 
 ## Defining new operations
diff --git a/tensorflow/g3doc/api_docs/python/state_ops.md b/tensorflow/g3doc/api_docs/python/state_ops.md
index e2a7a0c173..5025b4f659 100644
--- a/tensorflow/g3doc/api_docs/python/state_ops.md
+++ b/tensorflow/g3doc/api_docs/python/state_ops.md
@@ -828,7 +828,7 @@ Generates a `SaverDef` representation of this saver.
 #### Other Methods
 - - -
 
-#### `tf.train.Saver.export_meta_graph(filename=None, collection_list=None)` {#Saver.export_meta_graph}
+#### `tf.train.Saver.export_meta_graph(filename=None, collection_list=None, as_text=False)` {#Saver.export_meta_graph}
 
 Writes `MetaGraphDef` to save_path/filename.
 
@@ -837,6 +837,7 @@ Writes `MetaGraphDef` to save_path/filename.
 
 *  <b>`filename`</b>: Optional meta_graph filename including the path.
 *  <b>`collection_list`</b>: List of string keys to collect.
+*  <b>`as_text`</b>: If `True`, writes the meta_graph as an ASCII proto.
 
 ##### Returns:
 
diff --git a/tensorflow/g3doc/api_docs/python/train.md b/tensorflow/g3doc/api_docs/python/train.md
index 848faf6114..66e89b7990 100644
--- a/tensorflow/g3doc/api_docs/python/train.md
+++ b/tensorflow/g3doc/api_docs/python/train.md
@@ -2182,7 +2182,7 @@ Called when the thread starts.
 
 - - -
 
-### `tf.train.export_meta_graph(filename=None, meta_info_def=None, graph_def=None, saver_def=None, collection_list=None)` {#export_meta_graph}
+### `tf.train.export_meta_graph(filename=None, meta_info_def=None, graph_def=None, saver_def=None, collection_list=None, as_text=False)` {#export_meta_graph}
 
 Returns `MetaGraphDef` proto. Optionally writes it to filename.
 
@@ -2200,6 +2200,7 @@ a subgraph.
 *  <b>`graph_def`</b>: `GraphDef` protocol buffer.
 *  <b>`saver_def`</b>: `SaverDef` protocol buffer.
 *  <b>`collection_list`</b>: List of string keys to collect.
+*  <b>`as_text`</b>: If `True`, writes the `MetaGraphDef` as an ASCII proto.
 
 ##### Returns:
 
diff --git a/tensorflow/python/platform/__init__.py b/tensorflow/python/platform/__init__.py
deleted file mode 100644
index a79a1e3c96..0000000000
--- a/tensorflow/python/platform/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2015 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-
-"""Setup system-specific platform environment for TensorFlow."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-from . import control_imports
-if control_imports.USE_OSS:
-  from tensorflow.python.platform.default._init import *
-else:
-  from tensorflow.python.platform.google._init import *