diff options
author | Martijn Coenen <maco@google.com> | 2015-07-29 14:58:27 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 14:58:27 +0000 |
commit | 0b196bc5784de430ac75abd96f28f14e6b6042cd (patch) | |
tree | 41cd4682d38d6a8ff7eef84bfe26519fe204f2f6 /src/com/android | |
parent | a0d5d4c02e0bef4ec328e938cb67dde381d84ae7 (diff) | |
parent | 363a666afd3175904d5bc8b4e73d2751ca7af176 (diff) | |
download | android_packages_apps_Nfc-0b196bc5784de430ac75abd96f28f14e6b6042cd.tar.gz android_packages_apps_Nfc-0b196bc5784de430ac75abd96f28f14e6b6042cd.tar.bz2 android_packages_apps_Nfc-0b196bc5784de430ac75abd96f28f14e6b6042cd.zip |
am 363a666a: am c336a8c4: Merge "Reset P2P flag in de-initialization." into mnc-dr-dev
* commit '363a666afd3175904d5bc8b4e73d2751ca7af176':
Reset P2P flag in de-initialization.
Diffstat (limited to 'src/com/android')
0 files changed, 0 insertions, 0 deletions