tree 7920be004799534d3e89cdcb4f281c71d694a38a
parent 3fda14b0e37f8b6548a5d42df7e282e53541f43f
parent 3341736c14383ddbfecd2fb630b962e1acd3e26a
author Nick Pelly <npelly@google.com> 1292030343 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1292030343 -0800

Merge "Update Tag for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread