[polymer] Merge of master into polymer10-migration

netlog_viewer/chromeos_view.css

Index: netlog_viewer/chromeos_view.css
diff --git a/tracing/tracing/ui/tracks/object_instance_track.css b/netlog_viewer/chromeos_view.css
similarity index 69%
copy from tracing/tracing/ui/tracks/object_instance_track.css
copy to netlog_viewer/chromeos_view.css
index 0919e85524e11b0231bff1627d449467762fd7d9..df0b65e878ef6fd381b9311cb6263750f96d8a01 100644
--- a/tracing/tracing/ui/tracks/object_instance_track.css
+++ b/netlog_viewer/chromeos_view.css
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
-.object-instance-track {
-  height: 18px;
+#chromeos-view-password-div,
+#chromeos-view-parse-status {
+  margin-top: 20px;
 }