OSDN Git Service

Merge "NoMan: Add flag to turn off aggregated in-mem stats" into lmp-dev
authorChristoph Studer <chstuder@google.com>
Fri, 22 Aug 2014 19:40:16 +0000 (19:40 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 22 Aug 2014 19:40:17 +0000 (19:40 +0000)

Trivial merge