diff options
author | Martijn Coenen <maco@google.com> | 2012-07-25 21:48:31 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-25 21:48:31 -0700 |
commit | 7a1d2adf875d414625853b3a5360663e420a3769 (patch) | |
tree | ddeeaa27a4f6a30a7592501fb0f72b3b6411fc29 /AndroidManifest.xml | |
parent | 14a531a2bf46a852e163995ff1a4a3f20fd7dbce (diff) | |
parent | 238cce657e58a243447f0a4de644502e5db5dac1 (diff) | |
download | packages_apps_nfc-7a1d2adf875d414625853b3a5360663e420a3769.zip packages_apps_nfc-7a1d2adf875d414625853b3a5360663e420a3769.tar.gz packages_apps_nfc-7a1d2adf875d414625853b3a5360663e420a3769.tar.bz2 |
am 238cce65: am 69369b77: am 43f22631: Fix type of collision resolution record.
* commit '238cce657e58a243447f0a4de644502e5db5dac1':
Fix type of collision resolution record.
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions