OSDN Git Service

Merge "Cherry pick 97075" into ics-mr0
authorJohn Reck <jreck@google.com>
Fri, 21 Oct 2011 17:06:58 +0000 (10:06 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 21 Oct 2011 17:06:58 +0000 (10:06 -0700)

Trivial merge