tree cbca85823f06389095ae8eb123bcadf53d495ad7
parent 19ff8116bc6d508858f6a232ccdc65a8cbb7894c
parent bea58e287ef3fd529c59ca3bad2dc46d89de6df9
author Ben Chan <benchan@chromium.org> 1403566982 -0700
committer Ben Chan <benchan@chromium.org> 1403566986 -0700

Merge branch 'merge-mist-rewrite' into merge-mist

BUG=chromium:370275

Change-Id: I7df4427b6baa17e58e93db00f599066f5ee7fda1