OSDN Git Service

Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
authorDanielle Millett <dmillett@google.com>
Thu, 12 Jan 2012 15:28:24 +0000 (07:28 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 12 Jan 2012 15:28:24 +0000 (07:28 -0800)

Trivial merge