Andreas Huber b5c6be6db2 am 082e5171: Merge change I895fb7d7 into eclair-mr2
Merge commit '082e51712ab9c9ce94eaee88797bbdbc80b2004d' into eclair-mr2-plus-aosp

* commit '082e51712ab9c9ce94eaee88797bbdbc80b2004d':
  Squashed commit of the following:
2009-12-17 10:23:46 -08:00
..
2009-12-17 09:28:15 -08:00
2009-07-22 15:03:22 -07:00
2009-07-22 15:03:22 -07:00