summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | remove ACCESS_CACHE_FILESYSTEM permissionDoug Zongker2010-01-062-24/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Its definition is moving to frameworks/base. Change-Id: Ieb0409c458939c14e2cc8b5bdbcef14564a59c55
* | | | | explicit set an "optional" tagJean-Baptiste Queru2010-01-051-0/+2
| | | | |
* | | | | Merge commit 'goog/eclair-plus-aosp'Android Git Automerger2009-12-150-0/+0
|\| | | |
| * | | | am a61606af: Import revised translations. DO NOT MERGEEric Fischer2009-11-301-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a61606af5d154cd6281bd5f5de9e01e7240cca53' into eclair-plus-aosp * commit 'a61606af5d154cd6281bd5f5de9e01e7240cca53': Import revised translations. DO NOT MERGE
* | | | | am 31342163: am dc0accaa: Changed class paths for classes moved in ↵Paul Westbrook2009-12-141-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unbundling effort Merge commit '313421638f1fa01bf269350fd32d4e4df8afbc5e' * commit '313421638f1fa01bf269350fd32d4e4df8afbc5e': Changed class paths for classes moved in unbundling effort
| * \ \ \ \ am dc0accaa: Changed class paths for classes moved in unbundling effortPaul Westbrook2009-12-141-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'dc0accaaa66cdd7321505a8c42504b05a98ae341' into eclair-mr2-plus-aosp * commit 'dc0accaaa66cdd7321505a8c42504b05a98ae341': Changed class paths for classes moved in unbundling effort
| | * | | | | Changed class paths for classes moved in unbundling effortPaul Westbrook2009-12-141-1/+2
| | | | | | |
* | | | | | | am e88706b9: (-s ours) am b0033a36: am a61606af: (-s ours) Import revised ↵Eric Fischer2009-12-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE Merge commit 'e88706b900716b2cfaa917efdd320e6bef7b21fa' * commit 'e88706b900716b2cfaa917efdd320e6bef7b21fa': Import revised translations. DO NOT MERGE
| * | | | | | am b0033a36: am a61606af: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-12-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b0033a369377c3cfba1121f7ed7941165cc1c415' into eclair-mr2-plus-aosp * commit 'b0033a369377c3cfba1121f7ed7941165cc1c415': Import revised translations. DO NOT MERGE
| | * | | | | am a61606af: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-12-010-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a61606af5d154cd6281bd5f5de9e01e7240cca53' into eclair-mr2 * commit 'a61606af5d154cd6281bd5f5de9e01e7240cca53': Import revised translations. DO NOT MERGE
| | | * | | | Import revised translations. DO NOT MERGEEric Fischer2009-11-301-1/+1
| | | | | | |
* | | | | | | am 5b9bcf8d: am 18c30402: Fix Download application notification timestamp ↵Lixin Yue2009-11-251-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not correct issue Merge commit '5b9bcf8d3f74b8827b2a2e1f148d8ccd574083c8' * commit '5b9bcf8d3f74b8827b2a2e1f148d8ccd574083c8': Fix Download application notification timestamp not correct issue
| * | | | | | am 18c30402: Fix Download application notification timestamp not correct issueLixin Yue2009-11-251-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '18c3040260907472a9e471e5707a5b2f8320d074' into eclair-mr2-plus-aosp * commit '18c3040260907472a9e471e5707a5b2f8320d074': Fix Download application notification timestamp not correct issue
| | * | | | | Fix Download application notification timestamp not correct issueLixin Yue2009-11-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should set the value of Notification.when before calling setLatestEventInfo(). On downloading an image without exif information, the received file's timestamp is correct for main database field but incorrect for temporary display field. Root cause is that if Notification.when not set before calling setLatestEventInfo(), the timestamp value in milliseconds unit will be directly set to a field as second unit. Thus database will record the time as 1000 times forward as 2067, etc. However from UI the file's time will be just shown like "10/10/67", misleading people to think time is set backwards before system time 0(1969).
* | | | | | | am caec636f: am 89f9c9b4: change ACCESS_CACHE_FILESYSTEM to signatureOrSystemDoug Zongker2009-11-171-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'caec636f568242f59196fec7487051d535c236e6' * commit 'caec636f568242f59196fec7487051d535c236e6': change ACCESS_CACHE_FILESYSTEM to signatureOrSystem
| * | | | | | am 89f9c9b4: change ACCESS_CACHE_FILESYSTEM to signatureOrSystemDoug Zongker2009-11-171-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '89f9c9b4ccc22bc1f37edf5effa518970d342808' into eclair-mr2-plus-aosp * commit '89f9c9b4ccc22bc1f37edf5effa518970d342808': change ACCESS_CACHE_FILESYSTEM to signatureOrSystem
| | * | | | | change ACCESS_CACHE_FILESYSTEM to signatureOrSystemDoug Zongker2009-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for unbundling of google OTA.
* | | | | | | am c2c3d692: merge from open-source masterJean-Baptiste Queru2009-11-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c2c3d69268004ebe055dd7dfa63bed1818cc4334' * commit 'c2c3d69268004ebe055dd7dfa63bed1818cc4334': eclair snapshot
| * | | | | | merge from open-source masterJean-Baptiste Queru2009-11-150-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | merge from open-source masterJean-Baptiste Queru2009-11-150-0/+0
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | Merge commit 'goog/stage-korg-master' into HEAD
| | | * | | | merge from eclairJean-Baptiste Queru2009-11-1528-72/+105
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | eclair snapshotJean-Baptiste Queru2009-11-1232-539/+621
| | | | | | |
| | * | | | | am 9d6b0fa7: Import revised translations. DO NOT MERGEEric Fischer2009-11-131-4/+4
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9d6b0fa777f6978be741f2b34bf36cdec8cb7a41' into eclair-plus-aosp * commit '9d6b0fa777f6978be741f2b34bf36cdec8cb7a41': Import revised translations. DO NOT MERGE
| | * | | | | am 8dcf3cb2: Import revised translations. DO NOT MERGEEric Fischer2009-10-281-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8dcf3cb2c499612b42e9eeab9164d5be7c539169' into eclair-plus-aosp * commit '8dcf3cb2c499612b42e9eeab9164d5be7c539169': Import revised translations. DO NOT MERGE
| | * \ \ \ \ \ am 0ac5c77d: Import revised translations. DO NOT MERGEEric Fischer2009-10-213-3/+3
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0ac5c77d8fa81cbdd10dac48f927e0886f2c5da4' into eclair-plus-aosp * commit '0ac5c77d8fa81cbdd10dac48f927e0886f2c5da4': Import revised translations. DO NOT MERGE
* | | | | | | | | am 93c36e2c: (-s ours) am 38b7e34a: am 9d6b0fa7: (-s ours) Import revised ↵Eric Fischer2009-11-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE Merge commit '93c36e2ca5d0f3a5a176060b945d206cf3cf5a67' * commit '93c36e2ca5d0f3a5a176060b945d206cf3cf5a67': Import revised translations. DO NOT MERGE
| * | | | | | | | am 38b7e34a: am 9d6b0fa7: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-11-130-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '38b7e34aacd4ab7a73c26c099fe07abe6f83a9dc' into eclair-mr2-plus-aosp * commit '38b7e34aacd4ab7a73c26c099fe07abe6f83a9dc': Import revised translations. DO NOT MERGE
| | * | | | | | | am 9d6b0fa7: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-11-130-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9d6b0fa777f6978be741f2b34bf36cdec8cb7a41' into eclair-mr2 * commit '9d6b0fa777f6978be741f2b34bf36cdec8cb7a41': Import revised translations. DO NOT MERGE
| | | * | | | | | Import revised translations. DO NOT MERGEEric Fischer2009-11-131-4/+4
| | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | Approver: jerryw
* | | | | | | | am d438ebb0: (-s ours) am 54d20c42: Import revised translations. DO NOT MERGEEric Fischer2009-11-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd438ebb0de6fc5df12b462d7bea070c36ce39034' * commit 'd438ebb0de6fc5df12b462d7bea070c36ce39034': Import revised translations. DO NOT MERGE
| * | | | | | | am 54d20c42: Import revised translations. DO NOT MERGEEric Fischer2009-11-062-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '54d20c42b8fe7ae73e5546a6d5810d4a87f3681e' into eclair-mr2-plus-aosp * commit '54d20c42b8fe7ae73e5546a6d5810d4a87f3681e': Import revised translations. DO NOT MERGE
| | * | | | | | Import revised translations. DO NOT MERGEEric Fischer2009-11-062-2/+2
| | | | | | | |
* | | | | | | | am 8edb9a38: (-s ours) am a1ed67b2: am 8dcf3cb2: (-s ours) Import revised ↵Eric Fischer2009-10-290-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE Merge commit '8edb9a384ef96b4dcd3ce28e93ed1453dc2c5264' * commit '8edb9a384ef96b4dcd3ce28e93ed1453dc2c5264': Import revised translations. DO NOT MERGE
| * | | | | | | am a1ed67b2: am 8dcf3cb2: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-10-290-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a1ed67b275f4fe40c3709beea583dfdff22b17c1' into eclair-mr2-plus-aosp * commit 'a1ed67b275f4fe40c3709beea583dfdff22b17c1': Import revised translations. DO NOT MERGE
| | * | | | | | am 8dcf3cb2: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-10-290-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8dcf3cb2c499612b42e9eeab9164d5be7c539169' into eclair-mr2 * commit '8dcf3cb2c499612b42e9eeab9164d5be7c539169': Import revised translations. DO NOT MERGE
| | | * | | | | Import revised translations. DO NOT MERGEEric Fischer2009-10-281-1/+1
| | | | |/ / / | | | |/| | |
* | | | | | | am c6a96990: (-s ours) am c7a161b7: am 0ac5c77d: (-s ours) Import revised ↵Eric Fischer2009-10-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE Merge commit 'c6a9699075a5ea1aef070a49d59aa5b5d67b4eb1' * commit 'c6a9699075a5ea1aef070a49d59aa5b5d67b4eb1': Import revised translations. DO NOT MERGE
| * | | | | | am c7a161b7: am 0ac5c77d: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-10-220-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c7a161b7d241b47cb503c6cbb4344af0ff789b6c' into eclair-mr2-plus-aosp * commit 'c7a161b7d241b47cb503c6cbb4344af0ff789b6c': Import revised translations. DO NOT MERGE
| | * | | | | am 0ac5c77d: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-10-220-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0ac5c77d8fa81cbdd10dac48f927e0886f2c5da4' into eclair-mr2 * commit '0ac5c77d8fa81cbdd10dac48f927e0886f2c5da4': Import revised translations. DO NOT MERGE
| | | * | | | Import revised translations. DO NOT MERGEEric Fischer2009-10-213-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Approver: jerryw
* | | | | | | am bb32637c: merge from open-source masterJean-Baptiste Queru2009-10-140-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'bb32637c024de349eb2b81fbd74d8f416db6548b' * commit 'bb32637c024de349eb2b81fbd74d8f416db6548b':
| * | | | | | merge from open-source masterJean-Baptiste Queru2009-10-140-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | |
| | * | | | am 0a6d0804: am aad2e29e: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-10-080-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0a6d08049533bdb769ca229e5205abe9545b46c6' into eclair-plus-aosp * commit '0a6d08049533bdb769ca229e5205abe9545b46c6': Import revised translations. DO NOT MERGE
* | | | | | Reimport translations.Eric Fischer2009-10-1320-293/+280
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4ba9560db97bfbaa9e40641213eddc9c0be431e1
* | | | | | am 59563fb4: (-s ours) am 0a6d0804: (-s ours) am aad2e29e: (-s ours) Import ↵Eric Fischer2009-10-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revised translations. DO NOT MERGE Merge commit '59563fb4e1a51f9f15c51e15833943664ae21436' * commit '59563fb4e1a51f9f15c51e15833943664ae21436': Import revised translations. DO NOT MERGE
| * | | | | am 0a6d0804: (-s ours) am aad2e29e: (-s ours) Import revised translations. ↵Eric Fischer2009-10-080-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Merge commit '0a6d08049533bdb769ca229e5205abe9545b46c6' into eclair-mr2 * commit '0a6d08049533bdb769ca229e5205abe9545b46c6': Import revised translations. DO NOT MERGE
| | * | | | am aad2e29e: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-10-080-0/+0
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'aad2e29eb56d6861c4e6672c18f03b6e00f3b9dd' into eclair * commit 'aad2e29eb56d6861c4e6672c18f03b6e00f3b9dd': Import revised translations. DO NOT MERGE
| | * | | | Import revised translations. DO NOT MERGEEric Fischer2009-09-2911-25/+14
| | | |_|/ | | |/| |
* | | | | am 6625882b: am c04b1a0c: Disable unnecessary loggingJean-Baptiste Queru2009-09-251-3/+3
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Merge commit '6625882baf70bdeb3cfc84ee11e438894b6854b3' * commit '6625882baf70bdeb3cfc84ee11e438894b6854b3': Disable unnecessary logging
| * | | | am c04b1a0c: Disable unnecessary loggingJean-Baptiste Queru2009-09-241-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c04b1a0c79631ed8804475a1c4b144686bfaab15' into eclair-plus-aosp * commit 'c04b1a0c79631ed8804475a1c4b144686bfaab15': Disable unnecessary logging