From 9cc871e81c04ed11829c3364546b4500742140eb Mon Sep 17 00:00:00 2001
From: Jonathan Hseu <jhseu@google.com>
Date: Wed, 19 Jul 2017 15:04:52 -0700
Subject: Merge changes from github. END_PUBLIC

---
Commit daa67ad17 authored by Jonathan Hseu<vomjom@vomjom.net>
Committed by Frank Chen<frankchn@gmail.com>:
Remove unittest import (#11596)

---
Commit 491beb74c authored by A. Unique TensorFlower<gardener@tensorflow.org>
Committed by TensorFlower Gardener<gardener@tensorflow.org>:
BEGIN_PUBLIC
Automated g4 rollback of changelist 162423171

PiperOrigin-RevId: 162541442
---
 CODEOWNERS | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'CODEOWNERS')

diff --git a/CODEOWNERS b/CODEOWNERS
index 2f216e4161..69393c3775 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,8 +1,9 @@
 # Where component owners are known, add them here.
 
+tensorflow/core/platform/windows/* @mrry
+tensorflow/java/* @asimshankar
 tensorflow/tensorboard/* @jart @dandelionmane
 tensorflow/tools/docs/* @markdaoust
-tensorflow/java/* @asimshankar
 
 # contrib
 
@@ -46,5 +47,6 @@ tensorflow/contrib/stateless/* @girving
 tensorflow/contrib/tensor_forest/* @gilberthendry @thomascolthurst
 tensorflow/contrib/testing/* @dandelionmane
 tensorflow/contrib/timeseries/* @allenlavoie
+tensorflow/contrib/tpu/* @frankchn @saeta @jhseu
 tensorflow/contrib/training/* @joel-shor @ebrevdo
 tensorflow/contrib/util/* @sherrym
-- 
cgit v1.2.3