commit 40955edf9dc1e90b337af89543919eec4868dbe0
author Brian Carlstrom <bdc@google.com> Thu Apr 16 17:31:34 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 16 17:31:34 2015 +0000
tree 498c2bba2074887a6cbdd468cf060e5f79e6ac36
parent a2607ee4ebef49f88b5656e2eca2db362b32c70d
parent 14a982aa7a38fa89c916c252996632d401b1d043

am 14a982aa: Merge "Document hprof-conv -z"

* commit '14a982aa7a38fa89c916c252996632d401b1d043':
  Document hprof-conv -z

docs/html/tools/help/hprof-conv.jd

diff --git a/docs/html/tools/help/hprof-conv.jd b/docs/html/tools/help/hprof-conv.jd
index f96def2..982f337 100644
--- a/docs/html/tools/help/hprof-conv.jd
+++ b/docs/html/tools/help/hprof-conv.jd
@@ -8,9 +8,13 @@
 generated by the Android SDK tools to a standard format so you
 can view the file in a profiling tool of your choice. </p>
 
-<pre> hprof-conv &lt;infile&gt; &lt;outfile&gt;</pre>
+<pre> hprof-conv [-z] &lt;infile&gt; &lt;outfile&gt;</pre>
 
 <p>
 You can use "-" for <code>&lt;infile&gt;</code> or <code>&lt;outfile&gt;</code>
 to specify stdin or stdout.
 </p>
+
+<p>
+You can use "-z" to filter out zygote allocations shared by all applications.
+</p>