reconcile korg/master into goog/master android-2.0.1_r1 android-2.0_r1 android-2.1_r1 android-2.1_r2 android-2.1_r2.1p android-2.1_r2.1p2 android-2.1_r2.1s
authorJean-Baptiste Queru <jbq@google.com>
Sun, 26 Jul 2009 18:43:55 +0000 (11:43 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Sun, 26 Jul 2009 18:43:55 +0000 (11:43 -0700)

Trivial merge