summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images...Brad Fitzpatrick2011-03-301-1/+3
|\
| * am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in Thumbnail...Brad Fitzpatrick2011-03-281-1/+3
| |\
| | * Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"Brad Fitzpatrick2011-03-281-1/+3
| | |\
| | | * Handle OutOfMemoryError when decoding images in ThumbnailUtilsChrister Fletcher2011-03-281-1/+3
* | | | am 7a84a60d: am 1a5a2379: Merge "Unregister callback from binder when vibrati...Brad Fitzpatrick2011-03-301-0/+12
|\ \ \ \ | |/ / /
| * | | am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"Brad Fitzpatrick2011-03-281-0/+12
| |\ \ \ | | |/ /
| | * | Merge "Unregister callback from binder when vibration is removed"Brad Fitzpatrick2011-03-281-0/+12
| | |\ \ | | | |/ | | |/|
| | | * Unregister callback from binder when vibration is removedMathias Jeppsson2011-03-241-0/+12
* | | | am cd90d1f1: am 44e4b99f: Merge "UsbService: Make USB disconnect handling for...Mike Lockwood2011-03-291-6/+11
|\ \ \ \
| * \ \ \ am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mo...Mike Lockwood2011-03-291-6/+11
| |\ \ \ \
| | * \ \ \ Merge "UsbService: Make USB disconnect handling for accessory mode more robus...Mike Lockwood2011-03-291-6/+11
| | |\ \ \ \
| | | * | | | UsbService: Make USB disconnect handling for accessory mode more robustMike Lockwood2011-03-291-6/+11
* | | | | | | am ad91eee2: am 9c1ef098: Update the value for the NFC shared UID.Jeff Hamilton2011-03-291-1/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am 9c1ef098: Update the value for the NFC shared UID.Jeff Hamilton2011-03-241-1/+1
| |\ \ \ \ \ \
| | * | | | | | Update the value for the NFC shared UID.Jeff Hamilton2011-03-241-1/+1
* | | | | | | | am fc151b6e: Merge "Cleanup DataConnectionTracker" into honeycomb-LTEWink Saville2011-03-296-71/+47
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge "Cleanup DataConnectionTracker" into honeycomb-LTEWink Saville2011-03-296-71/+47
| |\ \ \ \ \ \ \
| | * | | | | | | Cleanup DataConnectionTrackerWink Saville2011-03-266-71/+47
* | | | | | | | | am b8c7c66d: am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised transl...Eric Fischer2011-03-290-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO N...Eric Fischer2011-03-290-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" int...Eric Fischer2011-03-290-0/+0
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge "Import revised translations. DO NOT MERGE" into honeycombEric Fischer2011-03-2910-166/+166
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-03-2910-166/+166
* | | | | | | | | | | am c1192096: am 7171f5b7: Merge "Fix the javadoc for LocationManager.requestS...Amith Yamasani2011-03-291-22/+26
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 7171f5b7: Merge "Fix the javadoc for LocationManager.requestSingleUpdate()...Amith Yamasani2011-03-291-22/+26
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeyc...Amith Yamasani2011-03-291-22/+26
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix the javadoc for LocationManager.requestSingleUpdate()Amith Yamasani2011-03-291-22/+26
* | | | | | | | | | | | am 35137d66: (-s ours) am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b...Bart Sears2011-03-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBreadBart Sears2011-03-249-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Do Not Merge: Cherry-pick change I7667f9b8 to GingerBreadBart Sears2011-03-239-0/+0
* | | | | | | | | | | | am 772f5bb1: (-s ours) am f440831d: DO NOT MERGEHuahui Wu2011-03-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am f440831d: DO NOT MERGEHuahui Wu2011-03-242-2/+24
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | DO NOT MERGEHuahui Wu2011-03-232-2/+24
* | | | | | | | | | | | am bc2489e4: am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" ...Eric Fischer2011-03-2942-329/+169
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycom...Eric Fischer2011-03-2942-329/+169
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1Eric Fischer2011-03-2942-329/+169
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-03-2942-329/+169
| | | | |_|_|_|_|/ / / | | | |/| | | | | | |
* | | | | | | | | | | am 6f67e7bf: am 2e383bc6: Merge "Making it possible to call SIP calls with sp...Brad Fitzpatrick2011-03-292-4/+9
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 2e383bc6: Merge "Making it possible to call SIP calls with special allowed...Brad Fitzpatrick2011-03-232-4/+9
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Making it possible to call SIP calls with special allowed chars."Brad Fitzpatrick2011-03-232-4/+9
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Making it possible to call SIP calls with special allowed chars.Magnus Strandberg2011-03-222-4/+9
| | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
* | | | | | | | | | | am a4206029: am 5d5a0ca5: Merge "Fixing the wrong link in YuvImage JavaDoc."Brad Fitzpatrick2011-03-291-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 5d5a0ca5: Merge "Fixing the wrong link in YuvImage JavaDoc."Brad Fitzpatrick2011-03-231-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Fixing the wrong link in YuvImage JavaDoc."Brad Fitzpatrick2011-03-231-3/+3
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Fixing the wrong link in YuvImage JavaDoc.Keiji Ariyama2011-02-051-3/+3
* | | | | | | | | | | am 0b0dbea0: am e4f33617: am faede250: IAB doc update for final launchBill Gruber2011-03-2911-123/+28
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am e4f33617: am faede250: IAB doc update for final launchBill Gruber2011-03-2911-123/+28
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am faede250: IAB doc update for final launchBill Gruber2011-03-2811-123/+28
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | / / / | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | IAB doc update for final launchBill Gruber2011-03-2811-123/+28
| | | | |_|_|_|/ / | | | |/| | | | |
* | | | | | | | | am 59d1b26a: Merge "DataConnectionTracker cleanup when disposed." into honeyc...Wink Saville2011-03-283-2/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /