summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 79622ebe: Merge "use LOCAL_PATH properly"Joe Onorato2012-08-175-126/+112
|\
| * Merge "use LOCAL_PATH properly"Joe Onorato2012-08-165-126/+112
| |\
| | * use LOCAL_PATH properlyJoe Onorato2012-07-215-126/+112
| |/
* | Import translations. DO NOT MERGEYing Wang2012-07-131-4/+4
* | Import translations. DO NOT MERGEYing Wang2012-06-181-2/+2
* | Merge "Remove obsolete ThirdPartyProject.prop file."Elliott Hughes2012-05-151-9/+0
|\ \ | |/ |/|
| * Remove obsolete ThirdPartyProject.prop file.Elliott Hughes2012-05-151-9/+0
* | am 3c5c83b8: Merge "Restore initialisation of vec38"Andrew Hsieh2012-05-121-0/+1
|\ \ | |/ |/|
| * Merge "Restore initialisation of vec38"Andrew Hsieh2012-05-111-0/+1
| |\
| | * Restore initialisation of vec38Chris Dearman2012-01-311-0/+1
* | | 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
| |\ \ \ | | |/ /
| * | | am 145233c9: Import revised translations. DO NOT MERGEEric Fischer2011-11-291-1/+1
| |\ \ \ | | | |/ | | |/|
| * | | am 8e3d9db4: Import revised translations.Eric Fischer2011-11-012-0/+60
| |\ \ \
| * \ \ \ 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
| | |\ \ \ \
| | * \ \ \ \ am 8ff1c4b5: Merge "Import revised translations."Eric Fischer2011-10-181-0/+30
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | am b53127de: (-s ours) am a359cef5: (-s ours) Import revised translations. D...Eric Fischer2011-10-180-0/+0
| | |\ \ \ \ \
* | | | | | | | Add libmedia_nativeGlenn Kasten2012-03-162-1/+3
* | | | | | | | am 319ce8db: (-s ours) Import translations. DO NOT MERGEEric Fischer2012-02-100-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Import translations. DO NOT MERGEEric Fischer2012-02-081-3/+6
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Import translations. DO NOT MERGEEric Fischer2012-01-261-3/+6
* | | | | | | 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
* | | | | | | | 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
* | | | | | | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-042-9/+9
|/ / / / / / /
* | | | | | | am 145233c9: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-290-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-291-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Import revised translations.Eric Fischer2011-11-291-1/+1
* | | | | | Merge "Import revised translations."Eric Fischer2011-11-020-0/+0
|\ \ \ \ \ \
| * | | | | | Import revised translations.Eric Fischer2011-11-022-0/+60
| | |_|_|_|/ | |/| | | |
* | | | | | am 8e3d9db4: Import revised translations.Eric Fischer2011-11-022-0/+60
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Import revised translations.Eric Fischer2011-11-012-0/+60
| |/ / /
* | | | Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block2011-10-251-5/+5
|/ / /
* | | Merge "Import revised translations."Eric Fischer2011-10-181-0/+30
|\ \ \ | |_|/ |/| |
| * | Import revised translations.Eric Fischer2011-10-181-0/+30
| |/
* | am a359cef5: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-180-0/+0
|\ \ | |/ |/|
| * Import revised translations. DO NOT MERGEEric Fischer2011-10-181-0/+30
|/
* Import revised translations.Eric Fischer2011-09-121-2/+2
* Import revised translations.Eric Fischer2011-08-2646-93/+93
* Part of effort to remove "failure" messaging to end-users.Claudia de Veaux2011-08-161-2/+2
* Import revised translations.Eric Fischer2011-07-251-2/+2
* Import revised translations.Eric Fischer2011-07-151-1/+1
* Remove the simulator target from all makefiles.Jeff Brown2011-07-112-11/+1
* Merge "Fix a pico bug."Narayan Kamath2011-06-281-2/+1
|\
| * Fix a pico bug.Narayan Kamath2011-06-271-2/+1
* | Use the new settings API for pico.Narayan Kamath2011-06-272-0/+18
|/