Merge "Remove yasm.rules dependency"
authorJohann <johannkoenig@google.com>
Wed, 8 Jan 2014 16:42:25 +0000 (08:42 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 8 Jan 2014 16:42:25 +0000 (08:42 -0800)

Trivial merge