summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 4e3fadd0 to eclair-mr2Jack Palevich2009-11-061-7/+8
|\
| * Merge change Ia4424950 into eclairAndroid (Google) Code Review2009-11-061-1/+1
| |\
| | * Fix stupid bug in GLThreadManager implementation.Jack Palevich2009-11-071-1/+1
* | | Merge change I72749815 into eclair-mr2Android (Google) Code Review2009-11-0622-2476/+1410
|\ \ \
| * | | Import revised translations. DO NOT MERGEEric Fischer2009-11-0622-2476/+1410
* | | | am 1edbc1a1: am 0e08055a: Merge change I14a9acd3 into eclair-sdkScott Main2009-11-063-167/+261
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am 0e08055a: Merge change I14a9acd3 into eclair-sdkScott Main2009-11-063-167/+261
| |\ \
| | * \ Merge change I14a9acd3 into eclair-sdkAndroid (Google) Code Review2009-11-063-167/+261
| | |\ \
| | | * | docs: add new document for the win usb driver;Scott Main2009-11-063-167/+261
* | | | | am 7ab900ed: Merge change Ic8093c11 into eclairDave Sparks2009-11-061-7/+14
|\ \ \ \ \ | |/ / / /
| * | | | Merge change Ic8093c11 into eclairAndroid (Google) Code Review2009-11-061-7/+14
| |\ \ \ \
| | * | | | Hold a lock while we access the preview heap.Dave Sparks2009-11-061-7/+14
* | | | | | am 2b3970a2: Merge change Idc1396c8 into eclairEvan Millar2009-11-061-2/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge change Idc1396c8 into eclairAndroid (Google) Code Review2009-11-061-2/+5
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.Evan Millar2009-11-061-2/+5
* | | | | | am 8d51f710: Merge change Icdd2864e into eclairMichael Chan2009-11-061-4/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge change Icdd2864e into eclairAndroid (Google) Code Review2009-11-061-4/+6
| |\ \ \ \ \
| | * | | | | b/2234854 Fixed Bluetooth API return codes for requesting permission to enabl...Michael Chan2009-11-051-4/+6
* | | | | | | am b90a187d: Merge change Ie994c0e8 into eclairjsh2009-11-061-0/+23
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge change Ie994c0e8 into eclairAndroid (Google) Code Review2009-11-061-0/+23
| |\ \ \ \ \ \
| | * | | | | | Update CdmaSmsTest unit test.jsh2009-11-061-0/+23
* | | | | | | | am b8933665: Merge change I3f0ded49 into eclairMike Lockwood2009-11-061-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge change I3f0ded49 into eclairAndroid (Google) Code Review2009-11-061-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Increase light sensor delay from one to two seconds.Mike Lockwood2009-11-061-1/+1
* | | | | | | | | am 49fa9e00: Merge change Ibf6e51b7 into eclairChristopher Tate2009-11-061-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge change Ibf6e51b7 into eclairAndroid (Google) Code Review2009-11-061-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Set argv[0] from the main thread of an app, not a random binder threadChristopher Tate2009-11-061-1/+1
* | | | | | | | | | Merge change I2effb21e into eclair-mr2Android (Google) Code Review2009-11-061-0/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add UPDATE_ACTION to Gservices, used by the new checkin service.Dan Egnor2009-11-051-0/+7
* | | | | | | | | | | am 7e4a0047: Merge change I97b30e2f into eclairEvan Millar2009-11-061-5/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge change I97b30e2f into eclairAndroid (Google) Code Review2009-11-061-5/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | * | | | | | | | | Revert jparks code from IPCThreadState.Evan Millar2009-11-061-5/+0
| | | |_|_|/ / / / / | | |/| | | | | | |
* | | | | | | | | | am 3cba7288: Merge change I6ccd2ebc into eclairCharles Mendis2009-11-065-9/+41
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge change I6ccd2ebc into eclairAndroid (Google) Code Review2009-11-065-9/+41
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Expose PowerManager.isScreenOn in the public api.Charles Mendis2009-11-065-9/+41
| | |/ / / / / / /
* | | | | | | | | am 45011f2d: (-s ours) Merge change I4e9fe62b into eclairCary Clark2009-11-060-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge change I4e9fe62b into eclairAndroid (Google) Code Review2009-11-061-0/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | do not merge -- original checkin to mr2 here:Cary Clark2009-11-061-0/+4
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge change I9a50fdf4 into eclair-mr2Android (Google) Code Review2009-11-061-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and ho...Andreas Huber2009-11-061-0/+1
* | | | | | | | | Merge change I29a3be5b into eclair-mr2Android (Google) Code Review2009-11-061-18/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Calendar: add CALLER_IS_SYNCADAPTER parameter.Ken Shirriff2009-11-051-18/+27
* | | | | | | | | | am 9eaff61a: am 91bb62f0: New API 4 with new CDMA constants.Xavier Ducrohet2009-11-061-0/+66
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | am 91bb62f0: New API 4 with new CDMA constants.Xavier Ducrohet2009-11-061-0/+66
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | New API 4 with new CDMA constants.Xavier Ducrohet2009-11-051-0/+66
| | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | am fde273ba: Merge change Ic997acac into eclairAndreas Huber2009-11-062-3/+21
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Merge change Ic997acac into eclairAndroid (Google) Code Review2009-11-062-3/+21
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Make AudioPlayer a little less verbose, defer starting audio playback until a...Andreas Huber2009-11-052-3/+21
* | | | | | | | am 8b1243e5: jni: GpsLocationProvider: Check for pending callbacks before wai...Jared Suttles2009-11-061-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | jni: GpsLocationProvider: Check for pending callbacks before waitingJared Suttles2009-11-061-1/+3
generated by cgit v1.1 at 2024-08-16 22:49:31 +0000