56aa70f7f2
Merge commit '854bcb95ce5d8d75b843e8da1b691fa93395977c' into eclair-plus-aosp * commit '854bcb95ce5d8d75b843e8da1b691fa93395977c': Squashed commit of the following: