OSDN Git Service

Merge "Merge commit '7f71d01'"
authorMike Lockwood <lockwood@google.com>
Tue, 3 Apr 2012 19:13:15 +0000 (12:13 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 3 Apr 2012 19:13:15 +0000 (12:13 -0700)

Trivial merge