OSDN Git Service

Merge "Squashed commit of the following:"
authorAndreas Huber <andih@google.com>
Fri, 19 Nov 2010 18:07:28 +0000 (10:07 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 19 Nov 2010 18:07:28 +0000 (10:07 -0800)
commitc7e11f86e0e85f559b6e05c9464cf9bdbc40369b
tree119214c6e9d6a946df03ebfbe906651feb0f1668
parent38c37d60fa99574fbbdfdcad544d165458a55ac9
parent4b838af77be8a27e2ac597f08b73335a87e66407
Merge "Squashed commit of the following:"