summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2Bruno Oliveira2011-06-211-0/+2
| | |\ \ \ \
| | | * | | | Integrating RandomMusicPlayer sample into tree.Bruno Oliveira2011-06-071-0/+2
* | | | | | | am 69ff6a47: am a6632992: am 04295266: add api level 13 flag for docsScott Main2011-06-231-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | am 04295266: add api level 13 flag for docsScott Main2011-06-211-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | add api level 13 flag for docsScott Main2011-06-211-0/+1
* | | | | | Revert "Create TextServiceManager and SpellCheckerService"satok2011-06-221-3/+0
* | | | | | Create TextServiceManager and SpellCheckerServicesatok2011-06-201-0/+3
| |_|_|/ / |/| | | |
* | | | | resolved conflicts for merge of 872a1e79 to masterDianne Hackborn2011-06-161-1/+5
|\ \ \ \ \ | |/ / / /
| * | | | am 2f04883f: SDK only: integrate new sample code, deprecating along the way.Dianne Hackborn2011-06-161-1/+5
| |\ \ \ \ | | |/ / /
| | * | | SDK only: integrate new sample code, deprecating along the way.Dianne Hackborn2011-06-161-1/+5
| | |/ /
* | | | KeyChain API refinementsBrian Carlstrom2011-06-091-1/+1
* | | | Interrogation of the view hierarchy from an AccessibilityService.Svetoslav Ganov2011-06-061-4/+6
* | | | Collect historical network stats.Jeff Sharkey2011-06-011-1/+1
* | | | Policy and rules work for ConnectivityManager.Jeff Sharkey2011-06-011-0/+1
* | | | Merge "framework/base changes to add new voicemail provider sample."Debashish Chatterjee2011-05-261-0/+2
|\ \ \ \
| * | | | framework/base changes to add new voicemail provider sample.Debashish Chatterjee2011-05-191-0/+2
* | | | | Remove need for onActivityResult from KeyChain APIBrian Carlstrom2011-05-251-0/+1
* | | | | Merge "Fix intermediate src dir for framework.jar"Ying Wang2011-05-241-2/+2
|\ \ \ \ \
| * | | | | Fix intermediate src dir for framework.jarYing Wang2011-05-181-2/+2
* | | | | | Add public API to do NDEF push.Jason parks2011-05-241-0/+1
* | | | | | Observe screen on/off events in NetworkPolicy.Jeff Sharkey2011-05-231-0/+1
|/ / / / /
* | | | | First pass at NetworkPolicy and activity tracking.Jeff Sharkey2011-05-131-0/+1
|/ / / /
* | | | Full local backup infrastructureChristopher Tate2011-05-101-0/+1
* | | | am cda9fda4: am 4c8fa6d1: am 1c71fffe: update platform version number for docsScott Main2011-05-051-1/+1
|\ \ \ \ | |/ / /
| * | | am 1c71fffe: update platform version number for docsScott Main2011-05-051-1/+1
| |\ \ \ | | |/ /
| | * | update platform version number for docsScott Main2011-05-051-1/+1
* | | | am 232ea51c: am 7c8be3a7: am 762481f0: Merge "adding the usb apis to the reso...Robert Ly2011-05-041-0/+2
|\ \ \ \ | |/ / /
| * | | am 762481f0: Merge "adding the usb apis to the resources browser" into honeyc...Robert Ly2011-05-041-0/+2
| |\ \ \ | | |/ /
| | * | adding the usb apis to the resources browserRobert Ly2011-05-021-0/+2
* | | | Adding KeyChain API and IKeyChainServiceBrian Carlstrom2011-04-201-0/+1
* | | | Add Java API for writing TTS enginesBjorn Bringert2011-04-151-2/+2
* | | | Merge "Rework thumbnails in activity manager."Dianne Hackborn2011-04-081-0/+1
|\ \ \ \
| * | | | Rework thumbnails in activity manager.Dianne Hackborn2011-04-081-0/+1
* | | | | Use the new API file format, and some minor tweaks to the old XML files that ...Joe Onorato2011-04-081-1/+1
* | | | | Remove the deprecated things from Config.java. These haven't been working sin...Joe Onorato2011-04-071-17/+0
|/ / / /
* | | | Tracking merge of dalvik-dev to masterBrian Carlstrom2011-04-011-0/+2
* | | | am 02a7f8eb: am 5c35c059: am 5b68c655: Merge "docs: update makefile to show j...Scott Main2011-03-301-0/+1
|\ \ \ \ | |/ / /
| * | | am 5b68c655: Merge "docs: update makefile to show javadocs diffs for api leve...Scott Main2011-03-301-0/+1
| |\ \ \ | | |/ /
| | * | docs: update makefile to show javadocs diffs for api level 12Scott Main2011-03-291-0/+1
* | | | Tracking SamplingProfiler change in libcoreBrian Carlstrom2011-03-241-4/+3
|/ / /
* | | resolved conflicts for merge of 38d0d562 to honeycomb-plus-aospNick Pelly2011-03-141-1/+1
|\ \ \ | |/ / |/| |
| * | am 367f41f8: Implement new NFC-EE API\'s as shared library (frameworks/base).Nick Pelly2011-03-101-1/+1
| |\ \
| | * | Implement new NFC-EE API's as shared library (frameworks/base).Nick Pelly2011-03-101-1/+1
| * | | am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbreadMike Lockwood2011-03-021-0/+1
| |\ \ \ | | |/ /
| | * | DO NOT MERGE: Backport USB accessory support to gingerbreadMike Lockwood2011-03-011-0/+1
* | | | Move USB framework support from android.hardware to android.hardware.usb packageMike Lockwood2011-03-011-1/+1
* | | | fixing resource browser for renderscript samples because the samples movedRobert Ly2011-02-281-2/+2
* | | | am b732b7b5: am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant...Xavier Ducrohet2011-02-281-0/+1
|\ \ \ \
| * \ \ \ am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."Xavier Ducrohet2011-02-281-0/+1
| |\ \ \ \ | | |/ / /
| | * | | am dff6b8e7: Merge "Add --non-constant-id to aapt."Xavier Ducrohet2011-02-281-0/+1
| | |\ \ \ | | | |/ / | | |/| |