summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Snap selection handles to textGeorge Mount2012-03-282-36/+254
* Merge "Remove superfluous code after removal of Android HTTP stack"Steve Block2012-03-283-214/+1
|\
| * Remove superfluous code after removal of Android HTTP stackSteve Block2012-03-263-214/+1
* | Merge "Tidy up usage of URLUtil constants"Jonathan Dixon2012-03-284-13/+6
|\ \
| * | Tidy up usage of URLUtil constantsJonathan Dixon2012-03-284-13/+6
* | | Update Wifi testsKenny Root2012-03-271-1/+3
* | | Merge changes Ibdf23227,I3681f98cKenny Root2012-03-277-21/+446
|\ \ \
| * | | Update Wifi to use new keystore functionKenny Root2012-03-212-4/+94
| * | | Add signing to keystoreKenny Root2012-03-205-17/+352
* | | | Intruder alerts with actions and swipe-to-cancel.Daniel Sandler2012-03-277-56/+292
* | | | Merge "Add text labels to intruder actions."Daniel Sandler2012-03-273-11/+55
|\ \ \ \
| * | | | Add text labels to intruder actions.Daniel Sandler2012-03-263-11/+55
* | | | | Merge "YieldTransaction should actually commit the transaction."Jeff Brown2012-03-271-4/+4
|\ \ \ \ \
| * | | | | YieldTransaction should actually commit the transaction.Jeff Brown2012-03-271-4/+4
* | | | | | Merge "Fix uninstallation tracking in the Backup Manager"Christopher Tate2012-03-271-138/+82
|\ \ \ \ \ \
| * | | | | | Fix uninstallation tracking in the Backup ManagerChristopher Tate2012-03-271-138/+82
* | | | | | | Merge "Multi-Project Commit: Move of filterfw out of system/media (2 of 7)"Marius Renn2012-03-27246-5/+31005
|\ \ \ \ \ \ \
| * | | | | | | Multi-Project Commit: Move of filterfw out of system/media (2 of 7)Marius Renn2012-03-27246-5/+31005
* | | | | | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-03-272-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-272-5/+5
* | | | | | | | | Merge "Drm encode mms parts while persisting the pdu"Tom Taylor2012-03-273-3/+404
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Drm encode mms parts while persisting the pduTom Taylor2012-03-273-3/+404
* | | | | | | | | | Merge "RTP: add a null-check in AudioStream.setDtmfType()."Chia-chi Yeh2012-03-271-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | RTP: add a null-check in AudioStream.setDtmfType().Chia-chi Yeh2012-03-271-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Make READ_LOGS signature|system|development"Nick Kralevich2012-03-271-9/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make READ_LOGS signature|system|developmentNick Kralevich2012-03-231-9/+9
* | | | | | | | | | | Merge "Do pause painting better"John Reck2012-03-273-9/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Do pause painting betterJohn Reck2012-03-273-9/+15
* | | | | | | | | | | | Merge "move hardware feature definitions"Colin Cross2012-03-2732-760/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | move hardware feature definitionsColin Cross2012-03-2632-760/+0
* | | | | | | | | | | | Merge "User management and switching"Amith Yamasani2012-03-2722-274/+682
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | User management and switchingAmith Yamasani2012-03-2722-274/+682
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Fixed headset detection broken on stingray"Eric Laurent2012-03-271-16/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed headset detection broken on stingrayEric Laurent2012-03-231-16/+7
* | | | | | | | | | | | | Merge "Avoid ClassCast when migrating ACTION_SEND extras."Jeff Sharkey2012-03-271-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Avoid ClassCast when migrating ACTION_SEND extras.Jeff Sharkey2012-03-271-2/+12
* | | | | | | | | | | | | am c2a6299a: am b7fd60bd: am bd26ba48: Merge "docs: update SDK and AVD Manage...Scott Main2012-03-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am b7fd60bd: am bd26ba48: Merge "docs: update SDK and AVD Manager strings; up...Scott Main2012-03-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am bd26ba48: Merge "docs: update SDK and AVD Manager strings; update android ...Scott Main2012-03-2629-220/+249
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ am 7822805f: am 72d125eb: am bd26ba48: Merge "docs: update SDK and AVD Manage...Scott Main2012-03-2729-220/+249
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am 72d125eb: am bd26ba48: Merge "docs: update SDK and AVD Manager strings; up...Scott Main2012-03-2629-220/+249
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bd26ba48: Merge "docs: update SDK and AVD Manager strings; update android ...Scott Main2012-03-2629-220/+249
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge "docs: update SDK and AVD Manager strings; update android tool doc and ...Scott Main2012-03-2629-220/+249
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | docs: update SDK and AVD Manager strings; update android tool docScott Main2012-03-2629-220/+249
* | | | | | | | | | | | | | | | | | am 6b59266b: am d87f2262: am af9a26b2: Merge "docs: replace the "Contribute" ...Scott Main2012-03-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am d87f2262: am af9a26b2: Merge "docs: replace the "Contribute" message with ...Scott Main2012-03-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | am af9a26b2: Merge "docs: replace the "Contribute" message with "Design"" int...Scott Main2012-03-261-8/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | am 1139a4f1: am 8f16f8bc: am 7fa4a28e: docs: add Coolpad to oem driver listScott Main2012-03-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 8f16f8bc: am 7fa4a28e: docs: add Coolpad to oem driver listScott Main2012-03-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | am 7fa4a28e: docs: add Coolpad to oem driver listScott Main2012-03-261-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |