OSDN Git Service

Merge "Fix build."
authorDianne Hackborn <hackbod@google.com>
Tue, 16 Aug 2011 02:22:25 +0000 (19:22 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 16 Aug 2011 02:22:25 +0000 (19:22 -0700)
commit37fb2791fb060f597f978fb7f180bec121934593
treec82ea0701795028bfaa7ad7455bdd433c145a2cd
parentb8b4c4c6598cea7308ebd6eb2c87ec4f5aa82792
parent2a4565af1a9093802905ca0dd3622aa479f905bd
Merge "Fix build."