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)
commitc80d23edfe3f7d80f1a9ad98339672c66e1f0045
tree2ec012fa06311ad0e6b94c9161848be293a3a0fe
parent0d4d153220f649228577e73e451a8b66630f024f
parent456cf7d222132a4a66b46a9317c89e2c6dcf3523
Merge "Squashed commit of the following:"