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)
* commit '19c8d5f55b1ff4f6953eb53019d148adab0459a5':
  Simpleperf: rewrite unsupported logging style.


Trivial merge