From 4dc376fc1939e8b121f33ee2fb6427efde7bc188 Mon Sep 17 00:00:00 2001
From: Eric Laurent <elaurent@google.com>
Date: Tue, 9 Feb 2010 05:49:38 -0800
Subject: [PATCH] Fix issue 2422322 again.

Correct merge error in previous commit ec78ad65a1110fe007c3bdaba824f66bbfe522e3: all changes sent by HTC were not included.