OSDN Git Service

Merge "Do not set the trace clock in atrace.rc." into oc-dev
authorCarmen Jackson <carmenjackson@google.com>
Tue, 23 May 2017 21:53:06 +0000 (21:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 21:53:06 +0000 (21:53 +0000)
commit755b10ddc37f8dd5f61ecab7e57ae900bab8e71e
tree9312610be6f8a1f5911c7278ccc65c477314e38a
parentfe614d7b37f5e1529de5437c45aead65150737fe
parent27ef38ca4cf711763b529691fd4725ef9872b394
Merge "Do not set the trace clock in atrace.rc." into oc-dev
am: 27ef38ca4c

Change-Id: I068e661eba9c7e668a6157dc4d704b4b73e8514c