summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am bb611587: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-06-260-0/+0
|\ | | | | | | | | * commit 'bb6115874c6377c358019acf85d5f78a498e762b': Import translations. DO NOT MERGE
| * Import translations. DO NOT MERGEBaligh Uddin2014-06-253-3/+3
| | | | | | | | | | Change-Id: I1a958ecbdbc610b1309b0f41c95f28606eb87a06 Auto-generated-cl: translation import
* | am 37d28574: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-05-220-0/+0
|\| | | | | | | | | * commit '37d285746e924723e6ec74d9e4700accc7768d0e': Import translations. DO NOT MERGE
| * Import translations. DO NOT MERGEBaligh Uddin2014-05-214-6/+6
| | | | | | | | | | Change-Id: I0a98132084476e4d4d67180649ab57f693df2058 Auto-generated-cl: translation import
* | am 90e7485d: am 02562d30: Merge "Avoid leaking cursors"Jeff Sharkey2014-05-101-20/+30
|\ \ | | | | | | | | | | | | * commit '90e7485d68095b5fc5044dd1bc6cd4dfc485eaa3': Avoid leaking cursors
| * \ am 02562d30: Merge "Avoid leaking cursors"Jeff Sharkey2014-05-101-20/+30
| |\ \ | | | | | | | | | | | | | | | | * commit '02562d300310909e30782b907a8c0cbdf76f14af': Avoid leaking cursors
| | * \ Merge "Avoid leaking cursors"Jeff Sharkey2014-05-101-20/+30
| | |\ \
| | | * | Avoid leaking cursorsMattias Nilsson2014-04-011-20/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding try/finally blocks to make sure that cursor resources are let go Change-Id: I596074aa9ab5752f91a26b5a03e1f39c23c64a5f
* | | | | am d0b810ff: Merge commit \'b1299b7414b05ee48d680d1f0199a43b31fc103d\' into HEADBill Yi2014-04-300-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'd0b810ffdd1ffcb130e5c1f539ecba651ca3e7ef':
| * | | | Merge commit 'b1299b7414b05ee48d680d1f0199a43b31fc103d' into HEADBill Yi2014-04-290-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | am 2834a68d: Merge "Drop restorecon call from DownloadProvider."Nick Kralevich2014-03-151-6/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '2834a68d04dc3d0ce42c231873e5bec4b0f0c65c': Drop restorecon call from DownloadProvider.
* | | | | am ea8e67d0: Merge "Track API package change."Elliott Hughes2014-04-281-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'ea8e67d0c31bda6b51b3991fb0dfada66b7359ea': Track API package change.
| * | | | Merge "Track API package change."Elliott Hughes2014-04-281-4/+4
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Track API package change.Elliott Hughes2014-04-281-4/+4
| |/ / / | | | | | | | | | | | | Change-Id: Ie2f35386e48894a9c9afb9717af90a5628dcd79b
* | | | am 58a8f205: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-04-230-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * commit '58a8f20526f06452e7348a3c287951d89a192ec5': Import translations. DO NOT MERGE
| * | | Import translations. DO NOT MERGEBaligh Uddin2014-04-2273-103/+1458
| | | | | | | | | | | | | | | | | | | | Change-Id: I6e60ad45fafed82ebcebb45efa7d28582c498460 Auto-generated-cl: translation import
* | | | am 2834a68d: Merge "Drop restorecon call from DownloadProvider."Nick Kralevich2014-03-151-6/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '2834a68d04dc3d0ce42c231873e5bec4b0f0c65c': Drop restorecon call from DownloadProvider.
| * | | 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>
* | | | am ed5049a8: (-s ours) am 13a6b148: (-s ours) am 56c0597e: (-s ours) am ↵Baligh Uddin2014-02-200-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 738782ff: (-s ours) Import translations. DO NOT MERGE * commit 'ed5049a8aee55aa422939ba356da2e1de5466e77': Import translations. DO NOT MERGE
| * | | am 13a6b148: (-s ours) am 56c0597e: (-s ours) am 738782ff: (-s ours) Import ↵Baligh Uddin2014-02-200-0/+0
|/| | | | | |/ | |/| | | | | | | | | | | | | translations. DO NOT MERGE * commit '13a6b148384ec433bafeb5fd547444f410955d7e': Import translations. DO NOT MERGE
| * | am 56c0597e: (-s ours) am 738782ff: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-02-200-0/+0
| |\ \ | | | | | | | | | | | | | | | | * commit '56c0597e29bb89ae66e3e5b9476ab13cb7283dba': Import translations. DO NOT MERGE
| | * \ am 738782ff: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-02-200-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '738782ffd27153884b8adeb3c797d7073c9c15ad': Import translations. DO NOT MERGE
| | | * | Import translations. DO NOT MERGEBaligh Uddin2014-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic24ce6a6b18e3c7e5adcc4f75beea818b33b3629 Auto-generated-cl: translation import
* | | | | add the WAKE_LOCK perm to the DownloadProviderFred Quintana2014-02-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DownloadService needs the WAKE_LOCK permission, which it normally gets as a side-affect of the MediaProvider being in the same shared UID. Since clockwork doesn't include the MediaProvider the uses-permission needs to be added to DownloadProvider. Change-Id: Ib3f58695e21e1cf7d841bc55093c26b631092b30
* | | | | am 34d915e1: am 18794718: am c5d43a1f: Merge "Creates parent directories ↵Jeff Sharkey2014-01-171-1/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before creates file" * commit '34d915e1dccf3d65e5a7c7f3a2273047ba8e51e8': Creates parent directories before creates file
| * | | | | am 18794718: am c5d43a1f: Merge "Creates parent directories before creates file"Jeff Sharkey2014-01-171-1/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '18794718f15cbf79c8da732af3e8368c7b905523': Creates parent directories before creates file
| | * | | | am c5d43a1f: Merge "Creates parent directories before creates file"Jeff Sharkey2014-01-171-1/+9
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | * commit 'c5d43a1fc595ce650a9a20d2811ad47429ebd7da': Creates parent directories before creates file
| | | * | | 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>
* | | | | | am 76214041: (-s ours) am 7f13f61b: (-s ours) am c478796c: (-s ours) am ↵Baligh Uddin2014-01-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f3c6521: (-s ours) Import translations. DO NOT MERGE * commit '762140410bebac113e04ff5c7038a834f9f28363': Import translations. DO NOT MERGE
| * | | | | am 7f13f61b: (-s ours) am c478796c: (-s ours) am 8f3c6521: (-s ours) Import ↵Baligh Uddin2014-01-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '7f13f61be97d5774516be544239bc0a0338cfb47': Import translations. DO NOT MERGE
| | * | | | am c478796c: (-s ours) am 8f3c6521: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-01-070-0/+0
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | * commit 'c478796c0f999a4d91bfe3d605412e93dfa2868f': Import translations. DO NOT MERGE
| | | * | | am 8f3c6521: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-01-070-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | * commit '8f3c652160e84e02f438a8dad72b9329d45b269f': Import translations. DO NOT MERGE
| | | | * | Import translations. DO NOT MERGEBaligh Uddin2014-01-063-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie4bcb30ee912d1b7486470d8849bde142c461d3b Auto-generated-cl: translation import
* | | | | | am b8f4b81b: am 9ec7f19f: am 1e950b1a: Merge "DownloadProvider: don\'t allow ↵Nick Kralevich2014-01-031-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backups." * commit 'b8f4b81b80af5a09c61a59dee95f4d32ce7d74cd': DownloadProvider: don't allow backups.
| * | | | | am 9ec7f19f: am 1e950b1a: Merge "DownloadProvider: don\'t allow backups."Nick Kralevich2014-01-031-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9ec7f19fad500366049b4e470ac3a0622aee556e': DownloadProvider: don't allow backups.
| | * | | | am 1e950b1a: Merge "DownloadProvider: don\'t allow backups."Nick Kralevich2014-01-031-1/+2
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | * commit '1e950b1a9345889a1197aeb4cb19e45f8b19a136': DownloadProvider: don't allow backups.
| | | * | | 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 1b3a7274: (-s ours) am cd3a74b3: (-s ours) am 5bafb68f: (-s ours) am ↵Baligh Uddin2013-12-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fc6d1ead: (-s ours) Import translations. DO NOT MERGE * commit '1b3a7274c1c54974b536b999b5e60228fd6a922c': Import translations. DO NOT MERGE
| * | | | | am cd3a74b3: (-s ours) am 5bafb68f: (-s ours) am fc6d1ead: (-s ours) Import ↵Baligh Uddin2013-12-270-0/+0
| |\| | | | | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'cd3a74b38ec9bb2b6fb20184c3be5abc10366a6a': Import translations. DO NOT MERGE
| | * | | am 5bafb68f: (-s ours) am fc6d1ead: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-12-260-0/+0
| |/| | | | | |/ / | | | | | | | | | | | | * commit '5bafb68f64d87fecd4f871b2f27df5d037292f5f': Import translations. DO NOT MERGE
| | * | am fc6d1ead: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-12-260-0/+0
| | |\| | | | | | | | | | | | | | | | | * commit 'fc6d1ead7d7abf97e5cf28f8871cf3dd0c09bd97': Import translations. DO NOT MERGE
| | | * Import translations. DO NOT MERGEBaligh Uddin2013-12-261-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib82d39385a5966f41daa15c9f9a7026e71030221 Auto-generated-cl: translation import
* | | | DO NOT MERGE reset to goog/klp-volantis-devQiwen Zhao2013-12-090-0/+0
|\ \ \ \ | |/ / / |/| | |
| * | | am c159de74: (-s ours) am 4bafe763: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-12-050-0/+0
| |\ \ \ | | |_|/ | |/| | | | | | * commit 'c159de74b326050eeb3dc2683a3ab55cbed9aadd':
* | | | 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