Merge "NFC: Submit the missing pieces of previous commit to fix build."

This commit is contained in:
Nick Pelly 2011-06-10 15:23:37 -07:00 committed by Android (Google) Code Review
commit bb3a9c3304

Diff Content Not Available