diff options
| author | Martijn Coenen <maco@google.com> | 2012-08-07 09:05:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-07 09:05:48 -0700 |
| commit | 56ba805cac20b1040b4a08bc6114ffb7e1a6bad0 (patch) | |
| tree | 06bb29a4bdbab7f4df8413cb93d6b37065630fa7 | |
| parent | 333bcb2e86e77c9fae37bbb17e86433c6866abb4 (diff) | |
| parent | 25b0c5d26d58d7d0af200b315a840881001b544d (diff) | |
| download | packages_apps_nfc-56ba805cac20b1040b4a08bc6114ffb7e1a6bad0.zip packages_apps_nfc-56ba805cac20b1040b4a08bc6114ffb7e1a6bad0.tar.gz packages_apps_nfc-56ba805cac20b1040b4a08bc6114ffb7e1a6bad0.tar.bz2 | |
am 25b0c5d2: (-s ours) Fix type of collision resolution record. (DO NOT MERGE)
* commit '25b0c5d26d58d7d0af200b315a840881001b544d':
Fix type of collision resolution record. (DO NOT MERGE)
0 files changed, 0 insertions, 0 deletions