Merge changes Ic1ce346a,Ic0b4e92c
authorAℓex Converse <aconverse@google.com>
Fri, 31 Jul 2015 19:05:54 +0000 (19:05 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 31 Jul 2015 19:05:54 +0000 (19:05 +0000)
commit90e563d91f4984b26e1d8d3db4f59a3198f2fecb
tree40c1e844a5724078c471a3b552f165c260ce25a5
parent7f8dd35329fcec4f32eba6f56ada69224e30f238
parentc62228f273c546d5f1d999b745425ea95b7063d4
Merge changes Ic1ce346a,Ic0b4e92c

* changes:
  Simplify model_rd_for_sb HBD ifdefs
  Simplify dist_block HBD ifdefs