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

* commit '0bdf9f8c48be4b001de2bac65b655063ca0d58ec':
  Dist com.android.nfc_extras.jar.