OSDN Git Service

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

Change-Id: I26f9f900840de08aab544b36a4af1d93dabe3221


Trivial merge