OSDN Git Service

am f0737a5a: (-s ours) am ae5cab41: Merge "Simpleperf: work around unexpected (pid...
authorYabin Cui <yabinc@google.com>
Thu, 27 Aug 2015 11:17:12 +0000 (11:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:17:12 +0000 (11:17 +0000)
* commit 'f0737a5a622bdfbaea6abfa8883c9e691f707afc':


Trivial merge