OSDN Git Service

Merge "simpleperf: avoid errors/warnings caused by sepolicy." am: 2a16892192
authorYabin Cui <yabinc@google.com>
Sat, 29 Oct 2016 02:23:44 +0000 (02:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 29 Oct 2016 02:23:44 +0000 (02:23 +0000)
am: 13a5a7021e

Change-Id: Ib2d5a08df7e856cbc9b5d792b907ff518cb8d963


Trivial merge