OSDN Git Service

Merge "libgui: disable CpuConsumer tests" into jb-mr1-dev
authorJamie Gennis <jgennis@google.com>
Tue, 4 Sep 2012 21:55:37 +0000 (14:55 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 4 Sep 2012 21:55:38 +0000 (14:55 -0700)

Trivial merge