summaryrefslogtreecommitdiffstats
path: root/tests/AndroidManifest.xml
Commit message (Expand)AuthorAgeFilesLines
* am e1cadb0c: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.ap...Nick Pelly2011-11-211-1/+1
|\
| * Replace vendor specific NfcGoogle.apk with generic Nfc.apkNick Pelly2011-11-211-1/+1
* | Fix copyright date, minor comment edit.Nick Pelly2011-10-311-2/+2
|/
* Merge snep p2p to masterBen Dodson2011-06-151-0/+37