OSDN Git Service

am 19c8d5f5: resolved conflicts for 6239958b to stage-aosp-master
authorYabin Cui <yabinc@google.com>
Mon, 21 Sep 2015 19:45:35 +0000 (19:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Sep 2015 19:45:35 +0000 (19:45 +0000)
commitc309e18409948eaf2162e328d48701b904c5c174
treec63859e68eea07efad56f6a44c66df11363a046e
parent54bc0b621b68644df2323e3b2ba147945371434f
parent19c8d5f55b1ff4f6953eb53019d148adab0459a5
am 19c8d5f5: resolved conflicts for 6239958b to stage-aosp-master

* commit '19c8d5f55b1ff4f6953eb53019d148adab0459a5':
  Simpleperf: rewrite unsupported logging style.