OSDN Git Service

Merge "CpuConsumer: inherit from ConsumerBase" into jb-mr1-dev
authorEino-Ville Talvala <etalvala@google.com>
Mon, 20 Aug 2012 23:18:10 +0000 (16:18 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 20 Aug 2012 23:18:11 +0000 (16:18 -0700)

Trivial merge