summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Snap for 7124398 from fd08adab1a66ea14e49f7c6e0b9d250a91a35d03 to mainline-ce...android-mainline-11.0.0_r37android-mainline-11.0.0_r26android-mainline-11.0.0_r13android11-mainline-cellbroadcast-releaseandroid-build-team Robot2021-02-044-7/+7
|\
| * Import translations. DO NOT MERGE ANYWHEREBill Yi2021-01-274-7/+7
* | Snap for 7080740 from 7b4d2c4a8c339f444acf48efc511ece5d3f9e133 to mainline-ce...android-build-team Robot2021-01-130-0/+0
|\|
| * [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f398d377f...Bill Yi2020-10-300-0/+0
|/|
| * Import translations. DO NOT MERGE ANYWHEREBill Yi2020-10-293-3/+3
* | Merge "Ensure pending intent on beam notification is immutable" into oc-dev a...android-mainline-11.0.0_r35TreeHugger Robot2020-08-291-1/+2
|\|
| * Merge "Ensure pending intent on beam notification is immutable" into oc-dev a...TreeHugger Robot2020-08-291-1/+2
| |\
| | * Merge "Ensure pending intent on beam notification is immutable" into oc-dev a...TreeHugger Robot2020-08-291-1/+2
| | |\
| | | * Merge "Ensure pending intent on beam notification is immutable" into oc-dev a...TreeHugger Robot2020-08-291-1/+2
| | | |\
| | | | * Merge "Ensure pending intent on beam notification is immutable" into oc-dev a...TreeHugger Robot2020-08-291-1/+2
| | | | |\
| | | | | * Merge "Ensure pending intent on beam notification is immutable" into oc-dev a...TreeHugger Robot2020-08-291-1/+2
| | | | | |\
| | | | | | * Merge "Ensure pending intent on beam notification is immutable" into oc-dev a...TreeHugger Robot2020-08-291-1/+2
| | | | | | |\
| | | | | | | * Merge "Ensure pending intent on beam notification is immutable" into oc-devTreeHugger Robot2020-08-291-1/+2
| | | | | | | |\
| | | | | | | | * Ensure pending intent on beam notification is immutableGeorge Chang2020-07-301-1/+2
* | | | | | | | | [automerger skipped] Protect Bluetooth device information when using NFC pair...George Chang2020-08-040-0/+0
|\| | | | | | | |
| * | | | | | | | [automerger skipped] Protect Bluetooth device information when using NFC pair...George Chang2020-08-040-0/+0
| |\| | | | | | |
| | * | | | | | | Protect Bluetooth device information when using NFC pairing am: 5700c012b2 am...George Chang2020-08-040-0/+0
| | |\| | | | | |
| | | * | | | | | Protect Bluetooth device information when using NFC pairing am: 5700c012b2 am...George Chang2020-08-041-0/+3
| | | |\| | | | |
| | | | * | | | | Protect Bluetooth device information when using NFC pairing am: 5700c012b2 am...George Chang2020-08-041-0/+3
| | | | |\| | | |
| | | | | * | | | Protect Bluetooth device information when using NFC pairing am: 5700c012b2 am...George Chang2020-08-041-0/+3
| | | | | |\| | |
| | | | | | * | | Protect Bluetooth device information when using NFC pairing am: 5700c012b2George Chang2020-08-041-0/+3
| | | | | | |\| |
| | | | | | | * | Protect Bluetooth device information when using NFC pairingGeorge Chang2020-07-301-0/+3
| | | | | | | |/
* | | | | | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2020-08-0144-84/+84
* | | | | | | | Keep screen on only when dispatch succeed am: 83d3c739f6George Chang2020-07-081-4/+8
|\| | | | | | |
| * | | | | | | Keep screen on only when dispatch succeedandroid11-devGeorge Chang2020-07-071-4/+8
* | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 3d0155c825 -s ours...Bill Yi2020-07-070-0/+0
|\| | | | | | |
| * | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 3d0155c825 -s oursBill Yi2020-07-070-0/+0
| |\| | | | | |
| | * | | | | | Import translations. DO NOT MERGEBill Yi2020-07-0642-80/+80
* | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: ab2041d601 -s oursBill Yi2020-06-280-0/+0
|\| | | | | | |
| * | | | | | | Import translations. DO NOT MERGEBill Yi2020-06-2815-26/+26
* | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev a...TreeHugger Robot2020-06-190-0/+0
|\| | | | | | |
| * | | | | | | Merge "Import translations. DO NOT MERGE" into rvc-devTreeHugger Robot2020-06-191-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Import translations. DO NOT MERGEBill Yi2020-06-191-1/+1
* | | | | | | | | Merge "Remove the NFC_DEP count from NumDiscNtf" into rvc-dev am: 73469c9d62George Chang2020-06-192-4/+11
|\| | | | | | | |
| * | | | | | | | Merge "Remove the NFC_DEP count from NumDiscNtf" into rvc-devGeorge Chang2020-06-192-4/+11
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove the NFC_DEP count from NumDiscNtfGeorge Chang2020-06-182-4/+11
| | |/ / / / / / /
* | | | | | | | | Refine setReaderMode API behavior am: 7f3967fde8Jack Yu2020-06-172-16/+101
|\| | | | | | | |
| * | | | | | | | Refine setReaderMode API behaviorJack Yu2020-06-172-16/+101
| |/ / / / / / /
* | | | | | | | Refine NfcBlockedNotification am: 2edd8c10b4George Chang2020-06-163-34/+34
|\| | | | | | |
| * | | | | | | Refine NfcBlockedNotificationGeorge Chang2020-06-163-34/+34
* | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 5f47026802 -s oursBill Yi2020-06-150-0/+0
|\| | | | | | |
| * | | | | | | Import translations. DO NOT MERGEBill Yi2020-06-1436-56/+56
* | | | | | | | Merge "Improve isInForeground" into rvc-dev am: 2cbe03023eGeorge Chang2020-06-041-12/+12
|\| | | | | | |
| * | | | | | | Merge "Improve isInForeground" into rvc-devGeorge Chang2020-06-041-12/+12
| |\ \ \ \ \ \ \
| | * | | | | | | Improve isInForegroundGeorge Chang2020-06-011-12/+12
* | | | | | | | | Ensure pending intent on NfcBlockedNotification is immutable am: fceb0755e6 a...George Chang2020-06-021-2/+2
|\| | | | | | | |
| * | | | | | | | Ensure pending intent on NfcBlockedNotification is immutable am: fceb0755e6George Chang2020-06-021-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / /
| | * | | | | | Ensure pending intent on NfcBlockedNotification is immutableGeorge Chang2020-05-271-2/+2
* | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 69d02d1457 -s oursBill Yi2020-05-310-0/+0
|\| | | | | | |
| * | | | | | | Import translations. DO NOT MERGEBill Yi2020-05-301-1/+1