OSDN Git Service

am d31825ad: am 0cb6d725: am 070dfc4c: Merge "Fix tracing."
authorIan Rogers <irogers@google.com>
Mon, 14 Jul 2014 20:39:12 +0000 (20:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 14 Jul 2014 20:39:12 +0000 (20:39 +0000)
* commit 'd31825ad49e7a0fe06548e8b1dc0250f80dd2178':


Trivial merge