ref: 22d8c156f946bed1ac6fccd893f9a4d10e206b50
parent: 76035d16d9b01d15a9fa873e579bd5c923c4bec3
parent: d237d483a524dc9188d5721a87287ee3e9a06910
author: Yaowu Xu <yaowu@google.com>
date: Wed Sep 24 10:09:45 EDT 2014
Merge "Correct the condition for border extension"