Commits
Nick Pelly authored and Android Git Automerger committed 734b8b8cb8bM
am 9fae3ecc: am ab39f1ef: Merge "Fix build." into gingerbread Merge commit '9fae3eccce6b3f336ecf304f6c15df0edd9ca7e6' * commit '9fae3eccce6b3f336ecf304f6c15df0edd9ca7e6': Fix build.
Showing diff to912932c2d95