4 Commits

Author	SHA1	Message	Date
Trevor Johns	682c24e228	Resolve merge conflicts of a5060ee to nyc-dev ... This undoes the automerger skip which occured in commit e740c84dc3 and replays it as a standard (NOT -s ours) merge. Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086	2016-04-19 02:03:59 -07:00
Chris Craik	17498cd944	Rework systrace analysis documentation ... Also update some of the out-of-date aspects of the systrace help page. Change-Id: I869f6d481ecc2835ea8713bb46f6e5d550abea98	2015-06-01 17:11:46 -07:00
Joe Fernandez	25ef208d7c	Systrace doc updates ... Update to reflect new user interface and command line options in Android 4.3+. Also add section on using application-level tracing. Fixes for bugs: b/7306847 b/10113361 b/9425766 b/7306847 b/9262485 Change-Id: Ia1c2a54fa2edc12cd68da27055aebe7ec47df745	2013-11-19 10:48:39 -08:00
Joe Fernandez	5e3a1c091f	docs: Systrace tool documentation ... Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7	2012-09-20 12:59:45 -07:00