tree 774226b1c9908309280d867636ec6f60c3376fa7
parent eebc62021cd7aa2d3efdc9a30256de969f794d59
parent 94d6dfee04b15e4605ad66308b7008d71a50859e
author Yabin Cui <yabinc@google.com> 1483818096 +0000
committer android-build-merger <android-build-merger@google.com> 1483818096 +0000

Merge "simpleperf: fix synchronization when reading mapped buffer." am: a587ece964 am: 04910bdaab am: adc709ba79
am: 94d6dfee04

Change-Id: I7f11d4274115a7b0675cc82a1fb812ab265f6b1f