summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Kill the global references in the OpenGL wrappers.Elliott Hughes2011-04-1114-403/+214
* Merge "Tidy up exception throwing in the media native code."Elliott Hughes2011-04-080-0/+0
|\
* \ Merge "Rework thumbnails in activity manager."Dianne Hackborn2011-04-080-0/+0
|\ \
* \ \ am 0fb4e73f: am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.Jamie Gennis2011-04-080-0/+0
|\ \ \ | |_|/ |/| |
| * | am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.Jamie Gennis2011-04-080-0/+0
| |\ \
| | * \ am 66380f76: Stagefright: authenticate ANativeWindow.Jamie Gennis2011-04-080-0/+0
| | |\ \
* | | \ \ am da2790fa: am 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb...Robert Greenwalt2011-04-080-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTERobert Greenwalt2011-04-080-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge "Make ApnSettings threadsafe." into honeycomb-LTERobert Greenwalt2011-04-080-0/+0
| | |\ \ \
* | | \ \ \ Merge "Use the new API file format, and some minor tweaks to the old XML file...Joe Onorato2011-04-080-0/+0
|\ \ \ \ \ \
* \ \ \ \ \ \ am ede9ed9f: am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into hone...Robert Greenwalt2011-04-080-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTERobert Greenwalt2011-04-080-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTERobert Greenwalt2011-04-080-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
* | | | | | | am de78352c: am ac9c73ae: Merge "Fix notification of disconnected networks." ...Robert Greenwalt2011-04-080-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | am ac9c73ae: Merge "Fix notification of disconnected networks." into honeycom...Robert Greenwalt2011-04-080-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Fix notification of disconnected networks." into honeycomb-LTERobert Greenwalt2011-04-080-0/+0
| | |\ \ \ \ | | | |/ / /
* | | | | | Merge "More JNI exception-throwing cleanup."Elliott Hughes2011-04-080-0/+0
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge "Add keychain user with special keystore access permissions"Brian Carlstrom2011-04-081-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Add keychain user with special keystore access permissionsBrian Carlstrom2011-04-081-0/+1
| |/ / / / / /
* | | | | | | am 4a28096d: am 73ad388a: Merge "Check different CellLocation type in GsmData...Wink Saville2011-04-080-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 73ad388a: Merge "Check different CellLocation type in GsmDataConnectionTra...Wink Saville2011-04-080-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Check different CellLocation type in GsmDataConnectionTracker" into ho...Wink Saville2011-04-080-0/+0
| | | |/ / / | | |/| | |
* | | | | | am 01f8f290: am 63edf6c4: Rename PhoneBase\'s DataConnectionTracker member.Robert Greenwalt2011-04-080-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 63edf6c4: Rename PhoneBase\'s DataConnectionTracker member.Robert Greenwalt2011-04-080-0/+0
| |\ \ \ \ \ | | |/ / / /
* | | | | | Merge "resolved conflicts for merge of 4b1a37d7 to master"Wink Saville2011-04-080-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ resolved conflicts for merge of 4b1a37d7 to masterWink Saville2011-04-080-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | |
| | * | | | am 5203a5bc: Cleanup debugging.Wink Saville2011-04-080-0/+0
| | |\ \ \ \ | | | |/ / /
* | | | | | Merge "TextLayoutCache - add glyphs caching"Fabrice Di Meglio2011-04-080-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | am b9381109: am 1905e166: Merge "DataConnection: set CID to the correct value...Wink Saville2011-04-080-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 1905e166: Merge "DataConnection: set CID to the correct value." into honey...Wink Saville2011-04-080-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "DataConnection: set CID to the correct value." into honeycomb-LTEWink Saville2011-04-080-0/+0
| | |\ \ \ \
* | | \ \ \ \ Merge "Tolerate missing AccountManager resource, not just missing resource name"Brian Carlstrom2011-04-080-0/+0
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ am 2ce73e77: am 9c7f433c: Merge "Fix isApnTypeActive in GDCT." into honeycomb...Robert Greenwalt2011-04-080-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 9c7f433c: Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTERobert Greenwalt2011-04-080-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTERobert Greenwalt2011-04-080-0/+0
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
* | | | | | | | Merge "Use jniThrowException for exception throwing from native code."Elliott Hughes2011-04-080-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ am e3e535a9: am 4410660e: Fix ISO country code of Slovenia.Robert Greenwalt2011-04-080-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | am 4410660e: Fix ISO country code of Slovenia.Robert Greenwalt2011-04-080-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Merge "Don't send pause again when coming back from full screen"Teng-Hui Zhu2011-04-080-0/+0
|\ \ \ \ \ \ \ \ \
* | | | | | | | | | Merge "Add camera focus area API."Wu-cheng Li2011-04-080-0/+0
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge "Improve activity manager debug dumps."Dianne Hackborn2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | am 16d8de7a: am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- jav...Nicolas Roard2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java counterpart...Nicolas Roard2011-04-070-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix f...Nicolas Roard2011-04-070-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Merge "Remove uncalled function -- java counterpart of the fix for bug:418380...Nicolas Roard2011-04-070-0/+0
| | | |\ \ \ \ \ \
* | | | \ \ \ \ \ \ Merge "Fix crash in bug 4259574"Adam Cohen2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge "Add params for primary account to ContactsContract"Daisuke Miyakawa2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | am 5f66c953: am 7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio t...Wink Saville2011-04-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2...Wink Saville2011-04-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupData...Wink Saville2011-04-070-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |