tree 001a6636ce1d55bd2e31ea69aa4ed2202591795d
parent 6b140bed44cd97177f46e8ccc8fb52c96fe24cb4
parent 311ec8962bef83bc240809e8365722a3a57dfec0
author Mark Salyzyn <salyzyn@google.com> 1494514610 -0700
committer Mark Salyzyn <salyzyn@google.com> 1494514610 -0700

resolve merge conflicts of 311ec8962 to master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia332f1e3d9c894f5fd36674ff3c75e4896b2c13a