tree b3b5c36a167e4d77bbbd612e9f2a90cb287fcd60
parent 0b53678b5c505390605aab1633c326ff9e57eb9f
parent fe02e0bfcded6901151046805f19141d498bd731
author Igor Murashkin <iam@google.com> 1403553016 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403553016 +0000

am fe02e0bf: am 3840bf87: am 98155f86: am 5e9746b7: am 1e125c71: Merge "gcam: Add empty SysTrace class" into klp-dev

* commit 'fe02e0bfcded6901151046805f19141d498bd731':