tree 84bc385274cf18a810ff7b3adca514ff85cdeadb
parent 615858a8ebb12b3541fd709e6e965ac814880261
parent 2ec83936a1c05d3286cb5656566e905a50d871de
author Martijn Coenen <maco@google.com> 1318622254 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1318622254 -0700

Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0