summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2Dan Pasanen2017-04-056-22/+106
|\
| * Import translations. DO NOT MERGEBill Yi2017-02-021-1/+1
| * Import translations. DO NOT MERGEBill Yi2016-12-080-0/+0
| |\
| | * Import translations. DO NOT MERGEBill Yi2016-12-081-1/+1
| * | Set the activity result for the watch's RingtonePickerActivity.Joshua Trask2016-12-051-39/+38
| |\|
| | * Set the activity result for the watch's RingtonePickerActivity.Joshua Trask2016-12-051-39/+38
| * | Import translations. DO NOT MERGEBill Yi2016-11-110-0/+0
| |\|
| | * Import translations. DO NOT MERGEBill Yi2016-11-102-2/+2
| * | Import translations. DO NOT MERGEBill Yi2016-11-042-2/+2
| |/
| * Merge "Add buttonless UI for watch type devices." into cw-f-devTreeHugger Robot2016-10-123-4/+89
| |\
| | * Add buttonless UI for watch type devices.Michael Kwan2016-10-123-4/+89
| * | Throw correct exception for null path insertMarco Nelissen2016-09-301-1/+1
| |\ \ | | |/ | |/|
| * | Merge "Don't insert entries with trailing slash" into nyc-mr1-devMarco Nelissen2016-09-280-0/+0
| |\ \
| * \ \ Don't insert entries with trailing slashMarco Nelissen2016-09-281-0/+4
| |\ \ \
| * \ \ \ Don't guess mimetype based on extension for directories.Marco Nelissen2016-09-281-1/+1
| |\ \ \ \
| * \ \ \ \ Merge "Fix check for existence of parent" into nyc-mr1-devMarco Nelissen2016-09-230-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ Fix check for existence of parentMarco Nelissen2016-09-231-1/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Rescan files from sdcard when removing nomedialukasz.merta2016-09-231-3/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Import translations. DO NOT MERGE am: 6f47139958 -s oursBill Yi2016-09-170-0/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge "Save build fingerprint when internal media scanning is done" into nyc-...Jean-Michel Trivi2016-09-140-0/+0
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Save build fingerprint when internal media scanning is doneJean-Michel Trivi2016-09-141-1/+11
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Fix race condition when inserting parent directoryMarco Nelissen2016-09-131-26/+37
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge "Make allowBackup of MediaProvider false" into nyc-mr1-devMarco Nelissen2016-09-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Make allowBackup of MediaProvider falseMasaki Ando2016-09-081-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Some fixes for MTP database corruptionChong Zhang2016-09-061-0/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Handle picker defaults for notification and alarm" into nyc-mr1-devRay Essick2016-08-240-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Handle picker defaults for notification and alarmRay Essick2016-08-241-9/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Scan media folder instead of preloads am: 543d12828aFyodor Kupolov2016-08-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | New Material iconcm-14.1_oldMichael Bestas2017-04-036-0/+1
* | | | | | | | | | | | | | | | | | | Automatic translation importAbhisek Devkota2017-03-201-0/+12
* | | | | | | | | | | | | | | | | | | Automatic translation importAbhisek Devkota2017-03-151-0/+1
* | | | | | | | | | | | | | | | | | | MediaProvider: Fix possible NPEMichael W2017-03-081-2/+2
* | | | | | | | | | | | | | | | | | | Automatic translation importMichael W2017-03-021-9/+0
* | | | | | | | | | | | | | | | | | | Automatic translation importAbhisek Devkota2017-02-1619-810/+58
* | | | | | | | | | | | | | | | | | | Automatic translation importstaging/cm-14.1-cafrebaseinky@build012016-12-3018-0/+1744
* | | | | | | | | | | | | | | | | | | MediaProvider: Add read storage permissionLuca Stefani2016-12-301-0/+1
* | | | | | | | | | | | | | | | | | | Screenshots info is not updated when device is plugged in MTP modeMaunik Shah2016-12-303-0/+51
* | | | | | | | | | | | | | | | | | | Fix mounting of non-FAT formatted SD cards (2/2)Michael Bestas2016-12-301-6/+6
* | | | | | | | | | | | | | | | | | | Merge a8fe7024686c27f2c71d4313e9eda5ddcbb7159b on remote branchLinux Build Service Account2016-12-1587-45/+1069
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge N-MR1 to remote branch.Lalit Kansara2016-12-0887-45/+1069
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Throw correct exception for null path insertMarco Nelissen2016-09-301-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Don't insert entries with trailing slash" into nyc-mr1-devTreeHugger Robot2016-09-281-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Don't insert entries with trailing slashMarco Nelissen2016-09-231-0/+4
| | | | |_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Don't guess mimetype based on extension for directories.Marco Nelissen2016-09-281-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Fix check for existence of parent" into nyc-mr1-devMarco Nelissen2016-09-231-1/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Fix check for existence of parentMarco Nelissen2016-09-231-1/+4
| | | |/ / / / / / / / / / /
| | * / / / / / / / / / / / Rescan files from sdcard when removing nomedialukasz.merta2016-09-231-3/+8
| | |/ / / / / / / / / / /
| | * | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-09-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | | * | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-09-171-1/+1
| | * | | | | | | | | | | Merge "Save build fingerprint when internal media scanning is done" into nyc-...Jean-Michel Trivi2016-09-141-1/+11
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | / | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |