OSDN Git Service

Merge "Squashed commit of the following:"
authorAndreas Huber <andih@google.com>
Mon, 22 Nov 2010 23:40:29 +0000 (15:40 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 22 Nov 2010 23:40:29 +0000 (15:40 -0800)
commit4a0ff4de7954295ef7a1fd595c999240523860f8
treea0b4ff19bc46a7e3d7860bcfb1c8c9d4bf2518bd
parent747698664d52691c9f2604f1d52dda4a02735616
parent1bb0ffd0981bec26f906bc62d449e136111af4f8
Merge "Squashed commit of the following:"