summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 79622ebe: Merge "use LOCAL_PATH properly"Joe Onorato2012-08-175-126/+112
|\ | | | | | | | | * commit '79622ebe5dd09754be0a5643413d11ecca300336': use LOCAL_PATH properly
| * Merge "use LOCAL_PATH properly"Joe Onorato2012-08-165-126/+112
| |\
| | * use LOCAL_PATH properlyJoe Onorato2012-07-215-126/+112
| |/ | | | | | | Change-Id: I5a177116b976be159042cab51c297861f275daa2
* | Import translations. DO NOT MERGEYing Wang2012-07-131-4/+4
| | | | | | | | | | Change-Id: I76f5fe040d04c10282bedc19153c1ee675ce03b7 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEYing Wang2012-06-181-2/+2
| | | | | | | | Change-Id: Ibe2323ff10a30b9ae5fecd8ec27c44b3ebb99982
* | Merge "Remove obsolete ThirdPartyProject.prop file."Elliott Hughes2012-05-151-9/+0
|\ \ | |/ |/|
| * Remove obsolete ThirdPartyProject.prop file.Elliott Hughes2012-05-151-9/+0
| | | | | | | | Change-Id: I35dfe009a3981d19f102cfa1c8ea99651a820f30
* | am 3c5c83b8: Merge "Restore initialisation of vec38"Andrew Hsieh2012-05-121-0/+1
|\ \ | |/ |/| | | | | * commit '3c5c83b8cf83ebbdf1103656036f3931b3c69f25': Restore initialisation of vec38
| * Merge "Restore initialisation of vec38"Andrew Hsieh2012-05-111-0/+1
| |\
| | * Restore initialisation of vec38Chris Dearman2012-01-311-0/+1
| | | | | | | | | | | | | | | | | | It was removed by both a3a82fd2d5be286128ade9007b1861da1d6d0a59 e0faec180004afb9a68ffe7dffce591f0dec305f
* | | Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
|\ \ \
| * \ \ am 319ce8db: Import translations. DO NOT MERGEEric Fischer2012-02-101-3/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '319ce8db8442d58f8d98eaf58becca74d817734f': Import translations. DO NOT MERGE
| * | | am 145233c9: Import revised translations. DO NOT MERGEEric Fischer2011-11-291-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '145233c9792dfe1d24918bb8fb1a2bbc16138c03': Import revised translations. DO NOT MERGE
| * | | am 8e3d9db4: Import revised translations.Eric Fischer2011-11-012-0/+60
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '8e3d9db415fb43dee289a0d3de7f53b49a0f842b': Import revised translations.
| * \ \ \ keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\ \ \ \
| | * \ \ \ undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| | |\ \ \ \
| | | * \ \ \ reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | | |\ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| | * | | | am c659351a: (-s ours) Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block2011-10-260-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c659351ad768dbc200bafc80b422908771087280': Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
| | * \ \ \ \ am 8ff1c4b5: Merge "Import revised translations."Eric Fischer2011-10-181-0/+30
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit '8ff1c4b5c920402885c1435bab0e85a83b030f6f': Import revised translations.
| | * | | | | am b53127de: (-s ours) am a359cef5: (-s ours) Import revised translations. ↵Eric Fischer2011-10-180-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE * commit 'b53127def7b7a6103f55f3f1dca81546dea36ef9': Import revised translations. DO NOT MERGE
* | | | | | | | Add libmedia_nativeGlenn Kasten2012-03-162-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0a3dcd2f6e983b09e93eabb529b56c3de5a9c0f7
* | | | | | | | am 319ce8db: (-s ours) Import translations. DO NOT MERGEEric Fischer2012-02-100-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | * commit '319ce8db8442d58f8d98eaf58becca74d817734f': Import translations. DO NOT MERGE
| * | | | | | | Import translations. DO NOT MERGEEric Fischer2012-02-081-3/+6
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Change-Id: I2ca75cb0b45e433c33d1d6c5e167ec5edb9998eb
* | | | | | | Import translations. DO NOT MERGEEric Fischer2012-01-261-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I44b685310450fa4b77cd1650a37f3776366f4190
* | | | | | | Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE"Steve Block2012-01-093-103/+103
|\ \ \ \ \ \ \
| * | | | | | | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-063-103/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: I24cb51849561ed5ebe3d8f87bd62deb034b86244
* | | | | | | | Merge "Fix onLoadLanguage, should actually load the language."Narayan Kamath2012-01-091-1/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix onLoadLanguage, should actually load the language.Narayan Kamath2012-01-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Would still work earlier because onSynthesizeText would load the right language, but getLanguage() would return the wrong language. Change-Id: Ic0e65ca3725aa1c06bf6eed88eaf823671477932
* | | | | | | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-042-9/+9
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: I2de8398913d131042541e344c3f8fa6db44f37aa
* | | | | | | am 145233c9: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-290-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '145233c9792dfe1d24918bb8fb1a2bbc16138c03': Import revised translations. DO NOT MERGE
| * | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-291-1/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Change-Id: Id39aac8fc17d8b1bcbc452b383365ae97adc5959
* | | | | | Import revised translations.Eric Fischer2011-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1c6d2ba30d07468c39b903451bbee54046f8554b
* | | | | | Merge "Import revised translations."Eric Fischer2011-11-020-0/+0
|\ \ \ \ \ \
| * | | | | | Import revised translations.Eric Fischer2011-11-022-0/+60
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Change-Id: I85c0505766af7b09b30fe928591372bc74590f9c
* | | | | | am 8e3d9db4: Import revised translations.Eric Fischer2011-11-022-0/+60
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | * commit '8e3d9db415fb43dee289a0d3de7f53b49a0f842b': Import revised translations.
| * | | | Import revised translations.Eric Fischer2011-11-012-0/+60
| |/ / / | | | | | | | | | | | | Change-Id: Ib2fdb9d87becc882cabcf717d8dddf22b8cca6d4
* | | | Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block2011-10-251-5/+5
|/ / / | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: Ia9892afbd743662a2272882bcdda7f23ae9d3b6d
* | | Merge "Import revised translations."Eric Fischer2011-10-181-0/+30
|\ \ \ | |_|/ |/| |
| * | Import revised translations.Eric Fischer2011-10-181-0/+30
| |/ | | | | | | Change-Id: Ib271cf1da25d0900b2d7ca66bc1d4da410f3c683
* | am a359cef5: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-180-0/+0
|\ \ | |/ |/| | | | | * commit 'a359cef5690df6c8220448f646390b9dd775a673': Import revised translations. DO NOT MERGE
| * Import revised translations. DO NOT MERGEEric Fischer2011-10-181-0/+30
|/ | | | Change-Id: I600ca0456457730365e0994b36e7b5eb3cfbb936
* Import revised translations.Eric Fischer2011-09-121-2/+2
| | | | Change-Id: I8fe29ddd44cd2ef7bfb8b82c905fdcbec9eec4e1
* Import revised translations.Eric Fischer2011-08-2646-93/+93
| | | | Change-Id: Iac304832d7eba6e174c0a57b8665abc47f2f622d
* Part of effort to remove "failure" messaging to end-users.Claudia de Veaux2011-08-161-2/+2
| | | | | | Bug: 5165745 Change-Id: I6143f286c6657715e78da38023beab7325571dd0
* Import revised translations.Eric Fischer2011-07-251-2/+2
| | | | Change-Id: I6c4ab9a45040b45334c1ed5db16781287103f8fc
* Import revised translations.Eric Fischer2011-07-151-1/+1
| | | | Change-Id: Id9401c0515048a9304d440dd910c11799932eaa7
* Remove the simulator target from all makefiles.Jeff Brown2011-07-112-11/+1
| | | | | | Bug: 5010576 Change-Id: Ia539a6a831a7d500d0c5336438e0bc0ff5854bf0
* Merge "Fix a pico bug."Narayan Kamath2011-06-281-2/+1
|\
| * Fix a pico bug.Narayan Kamath2011-06-271-2/+1
| | | | | | | | | | | | | | | | | | | | | | This is one of 10 million errors (really) reported by valgrind. I verified that some of them are OK, but it's probably not worth going through the rest. I expect most of those are just optimized code and fancy bit trickery. Change-Id: I3b8675ec8267691a5e6127a8e03239547107053e
* | Use the new settings API for pico.Narayan Kamath2011-06-272-0/+18
|/ | | | Change-Id: I852d0619d0f5bcb7218d3ab266ae86d117bc95e7
generated by cgit v1.1 at 2024-12-23 03:47:41 +0000