summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Refine setNfcSecure"HEADmasterGeorge Chang2021-10-122-20/+42
|\
| * Refine setNfcSecureGeorge Chang2021-10-122-20/+42
|/
* Merge "Restore default route destination if possible"Treehugger Robot2021-10-081-0/+1
|\
| * Restore default route destination if possibleJack Yu2021-10-071-0/+1
* | Merge "Merge Android 12"Xin Li2021-10-0714-39/+46
|\ \ | |/ |/|
| * Merge Android 12Xin Li2021-10-0614-39/+46
|/|
| * [automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MER...Bill Yi2021-09-090-0/+0
| |\ | |/ |/|
* | Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE"Bill Yi2021-09-091-0/+1
|\ \
| * \ Merge RQ3A.210905.001 to aosp-master - DO NOT MERGEBill Yi2021-09-081-0/+1
| |\ \
| | * \ Merge cherrypicks of [15164514, 15164515, 15164096, 15164078, 15163495, 15164...android-11.0.0_r46android-11.0.0_r43android11-qpr3-releaseAndroid Build Coastguard Worker2021-06-301-0/+1
| | |\ \
| | | * | Add HIDE_NON_SYSTEM_OVERLAY_WINDOWS permission to NfcAlisher Alikhodjaev2021-06-301-0/+1
| | |/ /
| | | * Merge "Only send the message when the screen state change" am: 5673af7cb4Treehugger Robot2021-09-091-1/+3
| | | |\ | |_|_|/ |/| | |
* | | | Merge "Only send the message when the screen state change"Treehugger Robot2021-09-091-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Only send the message when the screen state changechloedai2021-09-091-1/+3
|/ / /
| | * Merge "Support multi users for NFC payments" am: d5720420b8Treehugger Robot2021-09-026-32/+148
| | |\ | |_|/ |/| |
* | | Merge "Support multi users for NFC payments"android-s-beta-5android-s-beta-5Treehugger Robot2021-09-026-32/+148
|\ \ \
| * | | Support multi users for NFC paymentsJack Yu2021-09-026-32/+148
| | | * Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2021-08-1416-49/+57
| | | |\
| | | | * Merge "Migrate usages of Bluetooth profile connect and disconnect methods to ...Rahul Sabnis2021-08-031-5/+10
| | | | |\ | | | | |/ | | | |/|
| | | * | Merge "Migrate usages of Bluetooth profile connect and disconnect methods to ...Rahul Sabnis2021-08-031-5/+10
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Merge "Migrate usages of Bluetooth profile connect and disconnect methods to ...Rahul Sabnis2021-08-031-5/+10
|\ \ \ \ \
| * | | | | Migrate usages of Bluetooth profile connect and disconnect methods toRahul Sabnis2021-08-021-5/+10
| | | | | * Merge "Change 'TYPE_SYSTEM_ALERT' to 'TYPE_SYSTEM_DIALOG'" am: 3019e1afa9 am:...Chloe Dai2021-08-021-1/+1
| | | | | |\ | | | | | |/ | | | | |/|
| | | | * | Merge "Change 'TYPE_SYSTEM_ALERT' to 'TYPE_SYSTEM_DIALOG'" am: 3019e1afa9Chloe Dai2021-08-021-1/+1
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | Merge "Change 'TYPE_SYSTEM_ALERT' to 'TYPE_SYSTEM_DIALOG'"Chloe Dai2021-08-021-1/+1
|\ \ \ \ \ \
| * | | | | | Change 'TYPE_SYSTEM_ALERT' to 'TYPE_SYSTEM_DIALOG'chloedai2021-07-301-1/+1
| | |/ / / / | |/| | | |
| | | | | * Merge "Fix popping up notification repeatedly issue" am: 6624c15372 am: 69ab9...Treehugger Robot2021-07-301-1/+4
| | | | | |\ | | | | | |/ | | | | |/|
| | | | * | Merge "Fix popping up notification repeatedly issue" am: 6624c15372Treehugger Robot2021-07-301-1/+4
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | Merge "Fix popping up notification repeatedly issue"Treehugger Robot2021-07-301-1/+4
|\ \ \ \ \ \
| * | | | | | Fix popping up notification repeatedly issueMaoliang Tang2021-07-281-1/+4
| |/ / / / /
| | | | | * Merge "Add TEST_MAPPING" am: 4aeaa0499b am: 4165113f22Treehugger Robot2021-07-301-0/+8
| | | | | |\ | | | | | |/ | | | | |/|
| | | | * | Merge "Add TEST_MAPPING" am: 4aeaa0499bTreehugger Robot2021-07-301-0/+8
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | Merge "Add TEST_MAPPING"Treehugger Robot2021-07-301-0/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add TEST_MAPPINGGeorge Chang2021-07-281-0/+8
| | | | | * [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c811a34f...Bill Yi2021-07-280-0/+0
| | | | | |\ | | | | | |/ | | | | |/|
| | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-282-10/+10
| | | | | * [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99d51bcd5...Bill Yi2021-07-240-0/+0
| | | | | |\
| | | | | | * [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99d51bcd5...android12-devBill Yi2021-07-240-0/+0
| | | | | | |\
| | | | | | | * Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-241-1/+1
| | | | | * | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b7a98faf0...Bill Yi2021-07-240-0/+0
| | | | | |\| |
| | | | | | * | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b7a98faf0...Bill Yi2021-07-240-0/+0
| | | | | | |\ \
| | | | | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-241-1/+1
| | | | | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c5be3de2d...Bill Yi2021-07-240-0/+0
| | | | | |\| | |
| | | | | | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-241-1/+1
| | | | | * | | | Merge "Fix bluetooth peripheral handover issue" am: cb742da6cb am: 1764877a3bTreehugger Robot2021-07-211-6/+7
| | | | | |\ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | Merge "Fix bluetooth peripheral handover issue" am: cb742da6cbTreehugger Robot2021-07-211-6/+7
| | | | |\ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge "Fix bluetooth peripheral handover issue"Treehugger Robot2021-07-211-6/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix bluetooth peripheral handover issueMaoliang Tang2021-07-081-6/+7
| | | | | | * | | | Merge "Unset reader mode when nfc is turned off" am: 1706779148 am: b140ecf12aTreehugger Robot2021-07-192-0/+5
| | | | | | |\ \ \ \ | | | | | | |/ / / / | | | | | |/| | | |
| | | | | * | | | | Merge "Unset reader mode when nfc is turned off" am: 1706779148Treehugger Robot2021-07-192-0/+5
| | | | | |\ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-02 09:26:41 +0000