tree 0bc2dfbfaafb537a26c7f19284291bbf574ceaa1
parent d2070a797300d30877e63ca892cf96697dce337a
parent 0d873269861d4a23d6a7d7fea25a23a237c229a3
author Bertrand SIMONNET <bsimonnet@chromium.org> 1401728193 -0700
committer Mike Frysinger <vapier@chromium.org> 1401744850 -0400

Merge branch 'merge-libchromeos-rewrite' into merge-libchromeos

BUG=chromium:370258

Change-Id: Ie4ff2b1976ac7bacf77d13542fea17b3e8efdabf