ref: d6d431c476558302cebe051fe75c1cee70efc0f2
parent: fba0ead5430fd09b65fa2f10cd07b1cb07a0c087
parent: d0f237702745c4bfc0297d24f9465f960fb988ed
author: Jim Bankoski <jimbankoski@google.com>
date: Mon Dec 22 08:43:56 EST 2014
Merge "Revert "Revert "Removal of legacy zbin_extra / zbin_oq_value."""