ecae28bc3e
Merge commit '1cdb55aa97d8035a941a4bd7cf23063f18360ab5' into eclair-plus-aosp * commit '1cdb55aa97d8035a941a4bd7cf23063f18360ab5': Added code style fix that actually did not get submitted in 2nd patch of previous change.