OSDN Git Service

Merge "Add test config to mmapPerf" am: a2f6b2fe17 am: e988c3ee6a am: 0f92671105
authorDan Shi <dshi@google.com>
Fri, 31 Mar 2017 17:18:37 +0000 (17:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 31 Mar 2017 17:18:37 +0000 (17:18 +0000)
am: 7d587036fc

Change-Id: I10579c66beba811c03dac6640b50d28583b4999a


Trivial merge