summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Drop restorecon call from DownloadProvider."Nick Kralevich2014-03-151-6/+0
|\
| * Drop restorecon call from DownloadProvider.Stephen Smalley2014-03-121-6/+0
|/ | | | | | | | It is not necessary/useful to place this directory into a separate type from other app data files, so remove this restorecon. Change-Id: Iabd643a515c134ab2a62e82866a3f72530f795ba Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* Merge "Creates parent directories before creates file"Jeff Sharkey2014-01-171-1/+9
|\
| * Creates parent directories before creates fileRoger Chen2014-01-091-1/+9
|/ | | | | Change-Id: I124f7ce2b731b100e9572d7c5d95206e243ee316 Signed-off-by: Roger Chen <cxr514033970@gmail.com>
* Merge "DownloadProvider: don't allow backups."Nick Kralevich2014-01-031-1/+2
|\
| * DownloadProvider: don't allow backups.Nick Kralevich2014-01-031-1/+2
|/ | | | Change-Id: I5a07244d4bb7e11af4f5eb1a624fc20165248aab
* am a0daefb0: (-s ours) am 34f6f70e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-11-050-0/+0
|\ | | | | | | | | * commit 'a0daefb0032289905ab369b98a886dc322346e9c': Import translations. DO NOT MERGE
| * am 34f6f70e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-11-050-0/+0
| |\ | | | | | | | | | | | | * commit '34f6f70e69b1e272e19a70c01964a122e4d117e7': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEBaligh Uddin2013-11-047-36/+36
| | | | | | | | | | | | | | | Change-Id: Iffd5af8620652465c2f67635b33705ecf596746a Auto-generated-cl: translation import
* | | am d5c43876: (-s ours) am 1a0e1c0e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-10-280-0/+0
|\| | | | | | | | | | | | | | * commit 'd5c438761040510845e67979079f37da0737966f': Import translations. DO NOT MERGE
| * | am 1a0e1c0e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-10-280-0/+0
| |\| | | | | | | | | | | | | * commit '1a0e1c0eddcb835620ef884325f7e4f07e3439f7': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEBaligh Uddin2013-10-282-6/+6
| | | | | | | | | | | | | | | Change-Id: I8d3a6aaac652d2e11cc5fed65d13bcad4b5bb810 Auto-generated-cl: translation import
* | | am c0498333: (-s ours) am 4e4ef211: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-10-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | NOT MERGE" into klp-dev * commit 'c0498333d7a836f24ea72934e9d8d118a273b324': Import translations. DO NOT MERGE
| * | am 4e4ef211: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-170-0/+0
| |\| | | | | | | | | | | | | * commit '4e4ef211382d05c17c93b68fe0ab347a64951a9c': Import translations. DO NOT MERGE
| | * Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-171-1/+1
| | |\
| | | * Import translations. DO NOT MERGEBaligh Uddin2013-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I23f8f8783d7ff6ddb02e7f8a26a88b306ca699e1 Auto-generated-cl: translation import
* | | | am bd8d9a40: am eb217fc4: merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'bd8d9a406049d74bc6b5de94b6cd76e5bcd35ad8': Always check against canonical paths.
| * | | am eb217fc4: merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit 'eb217fc40c6fe952933cdc2a37875a5a49444491': Always check against canonical paths.
| | * | merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| | |\ \ | | | |/ | | |/|
| | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-130-0/+0
| | |/|
| | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-100-0/+0
| | | |\
| | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-060-0/+0
| | | | |\
| | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-020-0/+0
| | | | | |\
| | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-010-0/+0
| | | | | | |\
| | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-290-0/+0
| | | | | | | |\
| | | | | | | | * Always check against canonical paths.Jeff Sharkey2013-09-251-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10920351 Change-Id: I8c7e5344d9fd9d15565eaf93b91ce457a98ab98c
| | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-240-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-220-0/+0
| | | | | | | | | |\
* | | | | | | | | | | am b1bad37b: am c9b683f7: No directories in Downloads.Jeff Sharkey2013-10-101-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b1bad37bb310ef6cb43a68342a0f506c321742f8': No directories in Downloads.
| * | | | | | | | | | am c9b683f7: No directories in Downloads.Jeff Sharkey2013-10-101-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c9b683f739017c2f5e86661753f0ab1c44f359fa': No directories in Downloads.
| | * | | | | | | | | No directories in Downloads.Jeff Sharkey2013-10-101-0/+4
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11166290 Change-Id: I29c9cf53c77d03d1bcf408edd693b9c24d5665b6
* | | | | | | | | | am 8af99d2b: am d3e8c8b5: Register DocumentsProvider with <intent-filter>.Jeff Sharkey2013-10-091-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8af99d2b6ab66afc51dd258827cfe90cd476d948': Register DocumentsProvider with <intent-filter>.
| * | | | | | | | | am d3e8c8b5: Register DocumentsProvider with <intent-filter>.Jeff Sharkey2013-10-091-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd3e8c8b58754062342080965abf86f16c678bde9': Register DocumentsProvider with <intent-filter>.
| | * | | | | | | | Register DocumentsProvider with <intent-filter>.Jeff Sharkey2013-10-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follows API change in framework. Bug: 11109484 Change-Id: Icc3d4205b5f33f3821810c4a0692a030228363b7
* | | | | | | | | | am d4d5d166: am 60ebc6a8: merge in KQS81MEd Heyl2013-10-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd4d5d16612769a8dcfdad5cb43d73f292d1f2703': Import translations. DO NOT MERGE Import translations. DO NOT MERGE
| * | | | | | | | | am 60ebc6a8: merge in KQS81MEd Heyl2013-10-080-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '60ebc6a849e5f12169558465216ec3900a289c8b': Import translations. DO NOT MERGE Import translations. DO NOT MERGE
| | * | | | | | | | merge in KQS81MEd Heyl2013-10-080-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | / | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-190-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-160-0/+0
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-120-0/+0
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-110-0/+0
| | | | | | |\ \ \ \ \ \
| | | | | | | * \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-100-0/+0
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-090-0/+0
| | | | | | | | |\ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-040-0/+0
| | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-030-0/+0
| | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | * | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-08-292-0/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I107503db5dd53420ad908e8bd6e489ebf5971e71 Auto-generated-cl: translation import
| | | | | | | | | | | * | | | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-08-290-0/+0
| | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-260-0/+0
| | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | * | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-08-239-3/+499
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I60a8cd64b094a32b747f51882fb0b3b30d69680e Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | | | am 59b54d55: (-s ours) am 9b6bb995: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-10-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into klp-dev * commit '59b54d55772fbb4d6f28099f9128c14dd58f9dae': Import translations. DO NOT MERGE