Merge "Properly merge two different real time modes"
authorYaowu Xu <yaowu@google.com>
Fri, 31 Jan 2014 23:31:33 +0000 (15:31 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 31 Jan 2014 23:31:33 +0000 (15:31 -0800)

Trivial merge