diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-12-27 13:07:01 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-12-27 13:07:01 -0800 |
| commit | fb908e2c4a086407fed5967aa3e1d7d53b348893 (patch) | |
| tree | 4db310cf6ff3ab0dbb5407ffa13235b1d834be3a | |
| parent | 6a645b3241be2ba27b2b38f0cd68ad7e6fafafa5 (diff) | |
| parent | 525c260303268a83da4c3413b953d13c9084e834 (diff) | |
| download | packages_apps_nfc-fb908e2c4a086407fed5967aa3e1d7d53b348893.zip packages_apps_nfc-fb908e2c4a086407fed5967aa3e1d7d53b348893.tar.gz packages_apps_nfc-fb908e2c4a086407fed5967aa3e1d7d53b348893.tar.bz2 | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/Nfc into aosp
Conflicts:
nci/src/com/android/nfc/dhimpl/NativeNfcManager.java
src/com/android/nfc/NfcService.java
Change-Id: I52a73c696c003e8ccf513977968a42d917acf87a
0 files changed, 0 insertions, 0 deletions