Jean-Baptiste Queru ee27dd356e am 12902d68: resolved conflicts for merge of 78742e01 to stage-korg-master ...

* commit '12902d687fa1bd4bff3c2dfc079c71eacb00eedd':
  Strings for NI position request are moved to resources

2010-12-07 13:02:22 -08:00

..

android

am 47e6ccb6: Merge "Corrected MIFARE default key set" into gingerbread

2010-12-07 09:34:47 -08:00

com

resolved conflicts for merge of 78742e01 to stage-korg-master

2010-12-07 12:51:49 -08:00

jarjar-rules.txt

…

overview.html

…