tree fabd655776da40ffce36b8e44d0b96738498a20c
parent 8ddf143550cfc358458e2435dfa0383558cc741b
parent 6ba68c82af1f3d5b05b1d26804f95ed579fad99a
author ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> 1439960547 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1439960547 +0000

Merge "libsigrokdecode: add vbus voltage and current decoders: value, timestamp" into chromeos