763e62a8
Merge commit '763e62a831f6cf4e113bff868dab4d48560a3693' into froyo-plus-aosp * commit '763e62a831f6cf4e113bff868dab4d48560a3693': Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
4525c981