summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Expand)AuthorAgeFilesLines
* Import translations. DO NOT MERGEYing Wang2012-07-131-3/+3
* Import translations. DO NOT MERGEYing Wang2012-06-181-1/+1
* Import translations. DO NOT MERGEEric Fischer2012-06-131-1/+1
* Import translations. DO NOT MERGEEric Fischer2012-06-112-9/+8
* Import translations. DO NOT MERGEEric Fischer2012-06-072-2/+2
* Import translations. DO NOT MERGEEric Fischer2012-06-061-1/+1
* Import translations. DO NOT MERGEEric Fischer2012-06-052-2/+2
* Import translations. DO NOT MERGEEric Fischer2012-06-043-25/+13
* Import translations. DO NOT MERGEEric Fischer2012-06-0136-258/+129
* Import translations. DO NOT MERGEEric Fischer2012-05-3115-93/+47
* Import translations. DO NOT MERGEEric Fischer2012-05-3017-184/+92
* Import translations. DO NOT MERGEEric Fischer2012-05-2948-97/+145
* Merge "Fall back to NDEF push if handover SNEP get fails." into jb-devMartijn Coenen2012-05-251-0/+1
|\
| * Fall back to NDEF push if handover SNEP get fails.Martijn Coenen2012-05-251-0/+1
* | Import translations. DO NOT MERGEEric Fischer2012-05-2548-629/+713
|/
* Fix some strings.Martijn Coenen2012-05-221-4/+4
* Merge "Allow cancelling of Bluetooth Beam transfers." into jb-devMartijn Coenen2012-05-173-0/+2
|\
| * Allow cancelling of Bluetooth Beam transfers.Martijn Coenen2012-05-163-0/+2
* | Merge "Bluetooth Beam handover: deal with multi-file transfers." into jb-devMartijn Coenen2012-05-161-1/+1
|\ \ | |/
| * Bluetooth Beam handover: deal with multi-file transfers.Martijn Coenen2012-05-151-1/+1
* | Import translations. DO NOT MERGEEric Fischer2012-05-1511-330/+165
* | Import translations. DO NOT MERGEEric Fischer2012-05-1417-510/+255
|/
* Import translations. DO NOT MERGEEric Fischer2012-05-1148-2/+1442
* UI confirmation for pairing a BT device through NFC.Martijn Coenen2012-05-101-0/+3
* Bluetooth Beam bug fixes, UX and i18n.Martijn Coenen2012-05-101-0/+14
* Import translations. DO NOT MERGEEric Fischer2012-04-161-1/+1
* Import translations. DO NOT MERGEEric Fischer2012-04-131-1/+1
* Merge commit 'efc56ea'Mike Lockwood2012-03-211-0/+0
|\
| * Add back.png to the Nfc app's drawable-mdpiJason Simmons2011-10-271-0/+0
* | Import translations. DO NOT MERGEEric Fischer2012-03-051-1/+1
* | Remove unused assets from packages/apps/Nfc.Martijn Coenen2012-02-133-0/+0
* | Import translations. DO NOT MERGEEric Fischer2012-01-262-8/+4
* | Import revised translations.Eric Fischer2011-12-2946-1/+47
* | am 951dad2b: Restore deleted string still referenced from manifest.Eric Fischer2011-11-301-0/+1
|\ \
| * | Restore deleted string still referenced from manifest.Eric Fischer2011-11-291-0/+1
* | | Import revised translations.Eric Fischer2011-11-2946-138/+0
* | | am e1cadb0c: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.ap...Nick Pelly2011-11-211-1/+0
|\ \ \ | |/ /
| * | Replace vendor specific NfcGoogle.apk with generic Nfc.apkNick Pelly2011-11-211-1/+0
| * | Import revised translations. DO NOT MERGEEric Fischer2011-11-1648-96/+0
* | | resolved conflicts for merge of ebf4b36e to masterNick Pelly2011-11-111-7/+0
|\ \ \ | |/ /
| * | Implement static white-list access control for NFC-EE.Jeff Hamilton2011-11-111-7/+0
* | | Merge "Import revised translations."Eric Fischer2011-11-1046-186/+186
|\ \ \
| * | | Import revised translations.Eric Fischer2011-11-1046-186/+186
* | | | am c1c09483: Reduce sound assets size.Eric Laurent2011-11-103-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Reduce sound assets size.Eric Laurent2011-11-083-0/+0
| * | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-072-2/+2
| |\ \
| | * | Import revised translations. DO NOT MERGEEric Fischer2011-11-072-2/+2
* | | | am f7a151e2: Merge "Remove static background image from Beam when no hw-accel...Martijn Coenen2011-11-072-8/+1
|\ \ \ \ | |/ / /
| * | | Remove static background image from Beam when no hw-acceleration.Martijn Coenen2011-11-032-8/+1
| |/ /
* | | am 2d97436c: Merge "Import revised translations." into ics-mr1Eric Fischer2011-11-022-0/+28
|\ \ \ | |/ /
generated by cgit v1.1 at 2024-06-08 13:30:49 +0000