Merge "Fix build."
authorJean-Baptiste Queru <jbq@google.com>
Mon, 26 Jul 2010 16:56:10 +0000 (09:56 -0700)
committerAndroid Code Review <code-review@android.com>
Mon, 26 Jul 2010 16:56:10 +0000 (09:56 -0700)
commitc7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b
treece7dc533a62f0f7af9baebe02962ef098cbe351d
parent7cdd26ce30e61a108e4def932b96aca9f031e5d2
parent536ff5a6d700a80dbd75adb737ec4b560fbed2dc
Merge "Fix build."