summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2Dan Pasanen2017-04-0513-23/+23
|\ | | | | | | | | | | | | | | Android 7.1.2 Release 2 (N2G47E) # gpg: Signature made Mon 03 Apr 2017 01:41:49 AM CDT # gpg: using DSA key E8AD3F819AB10E78 # gpg: Can't check signature: No public key
| * Import translations. DO NOT MERGEBill Yi2017-02-029-14/+14
| | | | | | | | | | Change-Id: I9d6d75442dc9e30bca3569f39372ee2f00f6e883 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBill Yi2016-11-048-15/+15
| | | | | | | | | | Change-Id: I8ba3d298fa1a815901c9bdbaa739810a98fe75dd Auto-generated-cl: translation import
| * Import translations. DO NOT MERGE am: 721f8d54da -s oursBill Yi2016-09-170-0/+0
| |\ | | | | | | | | | | | | | | | am: 0dffcdc333 -s ours Change-Id: I012858f2b84e9f8493fcb7bef1c0671e4a275ae7
| | * Import translations. DO NOT MERGEBill Yi2016-09-170-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | am: 721f8d54da -s ours Change-Id: I5892f4794e34394296ab88cd32f729b0130c5e6b
| | | * Import translations. DO NOT MERGEBill Yi2016-09-161-1/+1
| | |/ | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 31516661 Change-Id: I420d0469200bac30d742b207c90cf7ee034831f1
| * | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 8e39c4499d -s oursBill Yi2016-08-130-0/+0
| |\| | | | | | | | | | | | | | | | am: 84dfd4a477 -s ours Change-Id: I5bea82b92707c7712da6712dd2c2e5c31325ec0e
| * | Import translations. DO NOT MERGE am: e68e16a75f -s oursBill Yi2016-08-130-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | am: 49a6ff1e75 -s ours Change-Id: Ic76e6430b6275c730959c16d0752047ca6c8e7de
| * \ \ Merge "Import translations. DO NOT MERGE" into nyc-mr1-devBill Yi2016-08-130-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: 969b3b9a65 -s ours Change-Id: Id1d2028a8555c50c2b1b917a18d5ed91972db700
| * \ \ \ Import translations. DO NOT MERGEBill Yi2016-08-130-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 27bde1cd91 -s ours Change-Id: If7984e83c3dcf95b44d37f89021437a71ac471ba
| * \ \ \ \ Import translations. DO NOT MERGE am: 330beae8b5 -s ours am: 54d99bc534 -s ↵Bill Yi2016-08-130-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 0c5d5f20bf -s ours am: e2dcf84344 -s ours am: 4af3db5767 -s ours am: e14384814f -s ours Change-Id: I40eb97693ba7d6c64bca58c7080f1084dcf42645
| * \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: f42d04b5a0 ↵Bill Yi2016-08-130-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: ee2b3ab7ba -s ours am: 919c9af7b1 -s ours Change-Id: I27362db1f006518601d0cce6c5800db8122c7b78
| * \ \ \ \ \ \ Import translations. DO NOT MERGE am: 5fc6c40272 -s ours am: 8b43c5fc8f -s ↵Bill Yi2016-08-130-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 1c8d8ebff0 -s ours Change-Id: Ic4eb88adcaa3237df3dab7966da901aedb916c08
| * \ \ \ \ \ \ \ Import translations. DO NOT MERGE am: bd5410eb21 -s ours am: 510a1b31ef -s ↵Bill Yi2016-08-130-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: c4d0f0604d -s ours am: 9a1d8ef503 -s ours am: 54ea168ba7 -s ours Change-Id: I0526455986186608a7f55dcf6fffd8fa23fafb23
* | | | | | | | | | Automatic translation importcm-14.1_oldAbhisek Devkota2017-03-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib648152a134e79de4b96f005e34b470aca1e02a5
* | | | | | | | | | AlarmService : Change stopSelf into stopSelfResultMao Jinlong2017-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change stopSelf into stopSelfResult to avoid stopping alarm which need to be started. If stopAlarm is called when there is no alarm being started and then startAlarm is called after stopAlarm, it is possibe that the started alarm is stopped by the previous stopAlarm calling as onDestroy will be called when stopAlarm. Use stopSelfResult if the startId matches the last start request then the service will be stopped. Change-Id: I50482a471b50537c2670cfc8220aef29c5214a3c CRs-Fixed: 1101808
* | | | | | | | | | DeskClock: fix ringtones stored on /sdcard/Alarmsgismo20042017-03-292-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we don't need permissions to play alarms from external sdcard. Change-Id: Ia8d0a814144f95809d7964efef4a35c9788eba0c
* | | | | | | | | | Automatic translation importAbhisek Devkota2017-03-202-0/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I43e20134f3ff1a4ef2956a9718c192b0ef8a239a
* | | | | | | | | | Automatic translation importAbhisek Devkota2017-03-151-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id1a51a5352021620db2af37a4045ff3e70486c80
* | | | | | | | | | Automatic translation importMichael W2017-03-023-691/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If628d774e2493638481f986069bd5b1e233d9140
* | | | | | | | | | Automatic translation importAbhisek Devkota2017-02-1623-37/+505
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9c539f043afe54ecb513c366cc289150b280c975
* | | | | | | | | | Automatic translation importstaging/cm-14.1-cafrebaseinky@build012016-12-30134-0/+12721
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5ad8a287140d8676ad47fc6a2e91763fcdcf61ac Ticket: -
* | | | | | | | | | Provide upgrade path for cm12.1 -> cm13.0Pavel Kirpichyov2016-12-306-11/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This just takes care of making the database is up to date with cm12.1 *Increasing alarm and switch to profile still need to be implemented. Change-Id: Ibbb2b618ddeb6f93cd95a0fba3923bfd6d3fbbbb
* | | | | | | | | | Make new menu entry to link to cLock widget settings.Martin Brabham2016-12-304-2/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * slightly modified for N Change-Id: I13ca3156c34eccdd8f60d8585281ae0585aac58e
* | | | | | | | | | Merge 4a67e31a9c5dcec8b06235ce32ba6d328f854d1f on remote branchLinux Build Service Account2016-12-1514-106/+106
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I52d2579b3495632dabdafa883b5479b474fdfcec
| * \ \ \ \ \ \ \ \ \ Merge N-MR1 to remote branch.Naveen Kumar2016-12-0813-105/+105
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8427fbae4b12de90194dd49dc483f16f0ed1cb92
| | * \ \ \ \ \ \ \ \ \ Merge N-MR1 to remoteLalit Kansara2016-12-0613-105/+105
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | Change-Id: I82c2030f40b246c7e59e6596098867936ddb21a6
| | | * | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBill Yi2016-08-130-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8e39c4499d -s ours Change-Id: Iace132d56c0aac76a884cbcd06a1e4a60e094791
| | | | * | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devTreeHugger Robot2016-08-1313-105/+105
| | | | |\ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ Import translations. DO NOT MERGEBill Yi2016-08-130-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | / | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | am: e68e16a75f -s ours Change-Id: Ieae2c79f05d698807b2e8936bdf30002c1f5423f
| | | | * | | | | | | | Import translations. DO NOT MERGEBill Yi2016-08-1213-105/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 30746157 Change-Id: I341846a755cf4445942eda012c7d3f9a6d40d88e
| | | * | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-devTreeHugger Robot2016-08-134-6/+6
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | / | | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
| | | | * | | | | | | Import translations. DO NOT MERGEBill Yi2016-08-124-6/+6
| | | | | |_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 30746157 Change-Id: Ib272fed4eb8bcec08d302abafcc4464c9460fcc8
| | | * | | | | | | Import translations. DO NOT MERGE am: 330beae8b5 -s ours am: 54d99bc534 -s ↵Bill Yi2016-08-130-0/+0
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | / | | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 0c5d5f20bf -s ours am: e2dcf84344 -s ours am: 4af3db5767 -s ours Change-Id: I71d3adbc90e2d16aaf9f605f308b8e675e63b8db
| | | | * | | | | Import translations. DO NOT MERGE am: 330beae8b5 -s ours am: 54d99bc534 -s ↵Bill Yi2016-08-130-0/+0
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 0c5d5f20bf -s ours am: e2dcf84344 -s ours Change-Id: I662964e7ec402fbb7b62daa8e97718ec3dba1330
| | | | | * \ \ \ \ Import translations. DO NOT MERGE am: 330beae8b5 -s ours am: 54d99bc534 -s ↵Bill Yi2016-08-130-0/+0
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 0c5d5f20bf -s ours Change-Id: I9706c4b250057d94f1f2bcffafc36943fd2217ac
| | | | | | * \ \ \ \ Import translations. DO NOT MERGE am: 330beae8b5 -s oursBill Yi2016-08-130-0/+0
| | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 54d99bc534 -s ours Change-Id: I13b4b9c29d3527ce3d4cad7d2513d6739b54fac3
| | | | | | | * \ \ \ \ Import translations. DO NOT MERGEBill Yi2016-08-130-0/+0
| | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 330beae8b5 -s ours Change-Id: I1cdce1b19c8266639ad8ae888e11258c38dc64f3
| | | | | | | | * | | | | Import translations. DO NOT MERGEBill Yi2016-08-12114-5922/+5926
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 30746157 Change-Id: Ic3c2c7bbe34de7c7e6ba260d127ed9f0bc80df8c
| | | * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: f42d04b5a0 ↵Bill Yi2016-08-130-0/+0
| | | |\| | | | | | | | | | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: ee2b3ab7ba -s ours Change-Id: I37f218075f27a4318a2edecb750db7c6f36d5064
| | | | * | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-devBill Yi2016-08-130-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f42d04b5a0 -s ours Change-Id: Ia7a97dc92a72ef2036b98d9bcb478ab03a422f7e
| | | | | * | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-devTreeHugger Robot2016-08-1372-689/+689
| | | | | |\ \ \ \ \ \ \
| | | * | | | | | | | | | Import translations. DO NOT MERGE am: 5fc6c40272 -s oursBill Yi2016-08-130-0/+0
| | | |\| | | | | | | | | | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8b43c5fc8f -s ours Change-Id: I547e6b853e1923e6d635d1554c6b66841f75ee49
| | | | * | | | | | | | Import translations. DO NOT MERGEBill Yi2016-08-130-0/+0
| | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5fc6c40272 -s ours Change-Id: I3a489c315cffa3c50b9a84d3d8386c3b7c8afcc9
| | | | | * | | | | | | Import translations. DO NOT MERGEBill Yi2016-08-1272-689/+689
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 30746157 Change-Id: Ia536e2c350866de42ae6a47b13e718c2022aaf00
| | | * | | | | | | | | Import translations. DO NOT MERGE am: bd5410eb21 -s ours am: 510a1b31ef -s ↵Bill Yi2016-08-130-0/+0
| | | |\| | | | | | | | | | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: c4d0f0604d -s ours am: 9a1d8ef503 -s ours Change-Id: I0e97c1e3740ec177e9672c7407e6a25db2203d02
| | | | * | | | | | | Import translations. DO NOT MERGE am: bd5410eb21 -s ours am: 510a1b31ef -s ↵Bill Yi2016-08-130-0/+0
| | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| | | | / | | | | | |_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: c4d0f0604d -s ours Change-Id: I40a3db579e832af9ff8dce9268f3478d70bc4def
| | | | | * | | | | Import translations. DO NOT MERGE am: bd5410eb21 -s oursBill Yi2016-08-130-0/+0
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | | | | | |/| / / / | | | | | | |/ / / | | | | | | | | | | | | | | | | | | am: 510a1b31ef -s ours Change-Id: I9ee3334f6245884a6c12c95778ef350fb3f02681
| | | | | | * | | Import translations. DO NOT MERGEBill Yi2016-08-130-0/+0
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bd5410eb21 -s ours Change-Id: I11f691682b5107af3b09a0f2d3ab31d992028f97
| | | | | | | * | Import translations. DO NOT MERGEBill Yi2016-08-1272-720/+720
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 30746157 Change-Id: I32d7b0610e61d085f47037ed10daea7dcbaa5d28
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-26 11:11:23 +0000