am 69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread

* commit '69e725eb8806180749b66903382754c86a15d0f6':
  Dist com.android.nfc_extras.jar.