Merge "Set the atrace clock to the best available value: boot, mono, or global."...

author Carmen Jackson <carmenjackson@google.com>

Fri, 19 May 2017 22:10:21 +0000 (22:10 +0000)

committer android-build-merger <android-build-merger@google.com>

Fri, 19 May 2017 22:10:21 +0000 (22:10 +0000)
author Carmen Jackson <carmenjackson@google.com>
Fri, 19 May 2017 22:10:21 +0000 (22:10 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 22:10:21 +0000 (22:10 +0000)
diff --cc cmds/atrace/atrace.cpp
Simple merge
diff --cc cmds/atrace/atrace.rc
Simple merge
author	Carmen Jackson <carmenjackson@google.com>
	Fri, 19 May 2017 22:10:21 +0000 (22:10 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 19 May 2017 22:10:21 +0000 (22:10 +0000)
		1	2
cmds/atrace/atrace.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
cmds/atrace/atrace.rc	patch \|	diff1 \|	diff2 \|	blob \| history