OSDN Git Service

am d0cbde8e: (-s ours) am 607b913e: am 366c38f8: Merge "Enable atrace to read categor...
authorYasuhiro Matsuda <mazda@google.com>
Thu, 27 Aug 2015 05:12:46 +0000 (05:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 05:12:46 +0000 (05:12 +0000)
commitacbe4f5b7fb500d290963b8101f05f6658da6c87
treef07b202ea380fb956bc11373d8993a1015b55f60
parent27dd16471a0683a351b94fb213683a1aec301a9f
parentd0cbde8e944d2578d7fd74d634a7d173df5c3403
am d0cbde8e: (-s ours) am 607b913e: am 366c38f8: Merge "Enable atrace to read categories from file."

* commit 'd0cbde8e944d2578d7fd74d634a7d173df5c3403':