tree 9312610be6f8a1f5911c7278ccc65c477314e38a
parent fe614d7b37f5e1529de5437c45aead65150737fe
parent 27ef38ca4cf711763b529691fd4725ef9872b394
author Carmen Jackson <carmenjackson@google.com> 1495576386 +0000
committer android-build-merger <android-build-merger@google.com> 1495576386 +0000

Merge "Do not set the trace clock in atrace.rc." into oc-dev
am: 27ef38ca4c

Change-Id: I068e661eba9c7e668a6157dc4d704b4b73e8514c