OSDN Git Service

Merge "Fix a build break." into ics-mr1
authorJohn Wang <johnwang@google.com>
Thu, 24 Nov 2011 00:48:32 +0000 (16:48 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 24 Nov 2011 00:48:32 +0000 (16:48 -0800)
commite95f49869b02dd9792718fb1075241acdf6ca775
treec9a68b7ff61ef1991d25bcd064fed5366576dc6b
parent8ce22f2644acb51bfe0b9d600f1d2ad64e80513c
parentb74ecb1d455011b7b4e979c480048395f6a2fd7a
Merge "Fix a build break." into ics-mr1