diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2011-11-02 17:30:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-02 17:30:17 +0000 |
| commit | f9a6652c6fac3163e70170787a172dbdda361a62 (patch) | |
| tree | 467ba1675551d2418a2700acf766db0a70de14a8 /res | |
| parent | a900c62284b2bc3a74ea4ef5978292734e74016c (diff) | |
| parent | c374dd0c6b48b1c69cbbd732d0b50fd62f79bfe1 (diff) | |
| download | packages_apps_nfc-f9a6652c6fac3163e70170787a172dbdda361a62.zip packages_apps_nfc-f9a6652c6fac3163e70170787a172dbdda361a62.tar.gz packages_apps_nfc-f9a6652c6fac3163e70170787a172dbdda361a62.tar.bz2 | |
am c374dd0c: (-s ours) am 08956967: Reconcile with ics-factoryrom-2-release
* commit 'c374dd0c6b48b1c69cbbd732d0b50fd62f79bfe1':
Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0"
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions