OSDN Git Service

Merge "Do not set the trace clock in atrace.rc." into oc-dev am: 27ef38ca4c
authorCarmen Jackson <carmenjackson@google.com>
Tue, 23 May 2017 21:55:37 +0000 (21:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 21:55:37 +0000 (21:55 +0000)
commit61167ba6f2a7c029de45041705b38dc04d6ec581
treebc26852051348758933c0034d68cb4c350e2364f
parent5a8cb035ae02eff00d73ecdcc65b4952a26b9124
parent755b10ddc37f8dd5f61ecab7e57ae900bab8e71e
Merge "Do not set the trace clock in atrace.rc." into oc-dev am: 27ef38ca4c
am: 755b10ddc3

Change-Id: If7306d6a2bd35a392aee6e2a6951781bead7cb78
cmds/atrace/atrace.rc