OSDN Git Service

Merge "Fix build." into ics-mr1
authorDianne Hackborn <hackbod@google.com>
Sat, 25 Feb 2012 00:23:07 +0000 (16:23 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 25 Feb 2012 00:23:07 +0000 (16:23 -0800)

Trivial merge