OSDN Git Service

Merge "Squashed commit of the following:"
authorAndreas Huber <andih@google.com>
Tue, 29 Jan 2013 18:32:23 +0000 (18:32 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 29 Jan 2013 18:32:23 +0000 (18:32 +0000)

Trivial merge