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-0587-123/+186
|\
| * Import translations. DO NOT MERGEBill Yi2017-02-127-12/+7
| * Import translations. DO NOT MERGEBill Yi2017-02-0875-150/+75
| * Import translations. DO NOT MERGEBill Yi2017-02-0680-80/+160
| * Merge "Reduce the timeframe which Deletion Helper queries for usage stats." i...Daniel Nishi2017-02-033-260/+36
| |\
| | * Reduce the timeframe which Deletion Helper queries for usage stats.Daniel Nishi2017-02-033-260/+36
| * | Import translations. DO NOT MERGEBill Yi2017-02-025-10/+10
| |/
| * Fix a bug where the ASM upsell never stops showing.Daniel Nishi2016-12-082-8/+37
| * Merge "Only show ASM activation notification locally." into nyc-mr2-devDaniel Nishi2016-12-081-1/+2
| |\
| | * Only show ASM activation notification locally.Daniel Nishi2016-12-081-1/+2
| * | Merge "Fix off-by-one error on ASM dismissal notification day count." into ny...Daniel Nishi2016-12-081-1/+1
| |\ \
| | * | Fix off-by-one error on ASM dismissal notification day count.Daniel Nishi2016-12-071-1/+1
| | |/
| * / Fix a bug where multiple private volumes caused inaccuracies.Daniel Nishi2016-11-282-10/+267
| |/
| * Import translations. DO NOT MERGEBill Yi2016-11-044-4/+10
| * Import translations. DO NOT MERGEBill Yi2016-10-2477-83/+237
| * Fix a bug where the storage manager notification showed too many times.Daniel Nishi2016-10-181-4/+20
| |\
| * \ Import translations. DO NOT MERGEBill Yi2016-10-060-0/+0
| |\ \
| * \ \ Import translations. DO NOT MERGEBill Yi2016-10-040-0/+0
| |\ \ \
| * \ \ \ Import translations. DO NOT MERGEBill Yi2016-10-010-0/+0
| |\ \ \ \
| * \ \ \ \ Import translations. DO NOT MERGEBill Yi2016-09-290-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ Add a warning when activating the Storage Manager.Daniel Nishi2016-09-286-0/+127
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge "Show first time warning in Deletion Helper." into nyc-mr1-devDaniel Nishi2016-09-240-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Show first time warning in Deletion Helper.Daniel Nishi2016-09-242-1/+65
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge "Show the storage settings when tapping on upsell notification." into n...Daniel Nishi2016-09-240-0/+0
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Show the storage settings when tapping on upsell notification.Daniel Nishi2016-09-242-3/+21
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge "Fix a bug where Deletion Helper could crash on deletion size callback....Daniel Nishi2016-09-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Fix a bug where Deletion Helper could crash on deletion size callback.Daniel Nishi2016-09-231-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Import translations. DO NOT MERGEBill Yi2016-09-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Import translations. DO NOT MERGE am: 3eac6881a0 -s oursBill Yi2016-09-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Update strings for deletion helper warnings.Daniel Nishi2016-09-131-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ AppDeletionPreference used app name instead of package name. am: 72cde70edeDaniel Nishi2016-08-313-8/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Import translations. DO NOT MERGEBill Yi2016-08-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Import translations. DO NOT MERGEBill Yi2016-08-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge \"Fix a bug where apps which should not be eligible for deletion were.\...Daniel Nishi2016-07-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Fix a bug where apps which should not be eligible for deletion were.Daniel Nishi2016-07-271-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge \"Fix a bug where the talkbacks for item statuses were broken.\" into n...Daniel Nishi2016-07-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Fix a bug where the talkbacks for item statuses were broken.Daniel Nishi2016-07-271-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in nyc-mr1-release history after reset to nyc-mr1-devstaging/cm-14.1-cafrebasecm-14.1_oldgitbuildkicker2016-10-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-050-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-020-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-290-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-250-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-130-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / | | | | | | |/| | | | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-310-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|_|_|_|_|_|/ / / / / / / / / | | | | | | | |/| | | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-230-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |_|_|_|_|_|_|/ / / / / / / / / | | | | | | | | |/| | | | | | | | | | | | | | |
| | | | | | | | | * | | | | | | | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-030-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | |_|_|_|_|_|/ / / / / / / / / | | | | | | | | | |/| | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-07-310-0/+0
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | |_|_|_|_|/ / / / / / / / / | | | | | | | | | | |/| | | | | | | | | | | | |
| | | | | | | | | | | * | | | | | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-07-260-0/+0
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | |/ / / / / / / / / / / / | | | | | | | | | | | |/| | | | | | | | | | | |
| | | | | | | | | | | | * | | | | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-07-210-0/+0
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \