Merge commit '6dea6f4e71b53e421564d783c227cbe0a2469183' into gingerbread-plus-aosp * commit '6dea6f4e71b53e421564d783c227cbe0a2469183': Squashed commit of the following:
Merge commit '6dea6f4e71b53e421564d783c227cbe0a2469183' into gingerbread-plus-aosp * commit '6dea6f4e71b53e421564d783c227cbe0a2469183': Squashed commit of the following: