summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic translation importcm-12.1clyde@build012016-12-163-0/+83
* Verify setForegroundDispatch caller is in foreground.Martijn Coenen2016-07-081-1/+8
* Automatic translation importJessica Wagantall2016-05-181-0/+1
* Automatic translation importMichael Bestas2016-04-2017-0/+664
* NFC: Move playSound to BeamManagerAtsushi Suga2015-09-083-39/+23
* nfc: create a bootstrap serviceJorge Ruesga2015-09-082-0/+41
* Automatic translation importMichael Bestas2015-07-131-0/+8
* Automatic translation importMichael Bestas2015-05-162-14/+1
* Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1stable/cm-12.1-YOG3CRicardo Cerqueira2015-03-10110-1773/+2272
|\
| * Re-add quotes for network key and ssidAndres Morales2015-02-041-2/+2
| * Material Beam icon.Martijn Coenen2015-01-265-0/+0
| * Merge "Only set WPA_PSK for WPA_PSK and WPA2_PSK" into lmp-mr1-devAndres Morales2015-01-211-7/+1
| |\
| | * Only set WPA_PSK for WPA_PSK and WPA2_PSKAndres Morales2015-01-091-7/+1
| * | Import translations. DO NOT MERGEGeoff Mendal2014-12-102-18/+18
| * | Merge "Remove asterisk from AID when removing prefix entries" into lmp-mr1-devAndres Morales2014-12-101-1/+17
| |\ \
| | * | Remove asterisk from AID when removing prefix entriesPaul Chaisson2014-12-081-1/+17
| | |/
| * | Import translations. DO NOT MERGEGeoff Mendal2014-12-082-18/+18
| * | Merge "Remove B' polling for B tags" into lmp-mr1-devAndres Morales2014-12-041-2/+1
| |\ \
| | * | Remove B' polling for B tagsAndres Morales2014-12-041-2/+1
| | |/
| * | Merge "Fix crash in ReaderMode API for Nakasi" into lmp-mr1-devAndres Morales2014-12-041-1/+1
| |\ \
| | * | Fix crash in ReaderMode API for NakasiAndres Morales2014-12-031-1/+1
| * | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2014-12-042-18/+18
| |\ \ \ | | |/ / | |/| |
| | * | Import translations. DO NOT MERGEGeoff Mendal2014-12-032-18/+18
| | |/
| * / Fix issue where Beam is disabled in SWAndres Morales2014-12-031-1/+1
| |/
| * Read UserHandle from passed in ShareDataAndres Morales2014-12-021-1/+3
| * Import translations. DO NOT MERGEGeoff Mendal2014-12-013-3/+3
| * Import translations. DO NOT MERGEGeoff Mendal2014-11-2654-108/+54
| * Merge "Fix NfcDiscoveryParameters" into lmp-mr1-devAndres Morales2014-11-241-2/+5
| |\
| | * Fix NfcDiscoveryParametersAndres Morales2014-11-241-2/+5
| * | Import translations. DO NOT MERGEGeoff Mendal2014-11-2472-370/+328
| |/
| * Merge "Prevent Beam at the lockscreen and during provisioning" into lmp-mr1-devAndres Morales2014-11-206-22/+56
| |\
| | * Prevent Beam at the lockscreen and during provisioningAndres Morales2014-11-196-23/+56
| * | Merge "Add verifyNfcPermission()." into lmp-mr1-devMartijn Coenen2014-11-201-0/+5
| |\ \
| | * | Add verifyNfcPermission().Martijn Coenen2014-11-131-0/+5
| | |/
| * | Merge "Add toast to tell the user Beam is busy" into lmp-mr1-devAndres Morales2014-11-194-5/+49
| |\ \
| | * | Add toast to tell the user Beam is busyAndres Morales2014-11-184-5/+49
| * | | Import translations. DO NOT MERGEGeoff Mendal2014-11-1972-526/+766
| * | | Merge "Restrict RF Field events to preferred app." into lmp-mr1-devMartijn Coenen2014-11-193-3/+46
| |\ \ \
| | * | | Restrict RF Field events to preferred app.Martijn Coenen2014-11-123-3/+46
| | | |/ | | |/|
| * | | Merge "Make BT pairing strings localizable" into lmp-mr1-devAndres Morales2014-11-172-25/+35
| |\ \ \ | | | |/ | | |/|
| | * | Make BT pairing strings localizableAndres Morales2014-11-132-25/+35
| * | | Merge "Refactor Beam to work with managed profiles" into lmp-mr1-devAndres Morales2014-11-1722-1116/+1274
| |\| |
| | * | Refactor Beam to work with managed profilesAndres Morales2014-11-1222-1116/+1274
| | |/
| * / Parse auth type from WPS tagAndres Morales2014-11-121-84/+85
| |/
| * Merge "Deactivate Beam when DISALLOW_OUTGOING_BEAM is set." into lmp-mr1-devBenjamin Franz2014-10-282-6/+51
| |\
| | * Deactivate Beam when DISALLOW_OUTGOING_BEAM is set.Benjamin Franz2014-10-222-6/+51
| * | Merge "Reactivate Beam sharing for managed profiles." into lmp-mr1-devBenjamin Franz2014-10-282-6/+4
| |\ \
| | * | Reactivate Beam sharing for managed profiles.Benjamin Franz2014-10-152-6/+4
| | |/
| * | am 6fda4eba: am 5443a8f5: Don\'t scale Beam screenshot.Martijn Coenen2014-10-201-1/+1
| |\ \
| | * \ am 5443a8f5: Don\'t scale Beam screenshot.Martijn Coenen2014-10-201-1/+1
| | |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 00:28:05 +0000