summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ | | | |/ | | |/|
| | | * WAPPushManager, WAP Push over SMS message handlernoda2011-02-181-0/+1
* | | | am d2acfd6d: am a58f58da: Merge "Doc change: fixing renderscript samples" int...Robert Ly2011-02-171-0/+2
|\ \ \ \ | |/ / /
| * | | Doc change: fixing renderscript samplesRobert Ly2011-02-171-0/+2
* | | | am 2b0c6fdf: am 97ef3b41: Merge "docs: revise a couple sample app names to ma...Scott Main2011-02-151-2/+2
|\ \ \ \ | |/ / /
| * | | docs: revise a couple sample app names to match side navScott Main2011-02-151-2/+2
* | | | am c7f15f5c: am 5a1b6357: Merge "Adding StackWidget sample code" into honeycombAdam Cohen2011-02-111-0/+2
|\ \ \ \ | |/ / /
| * | | Merge "Adding StackWidget sample code" into honeycombAdam Cohen2011-02-111-0/+2
| |\ \ \
| | * | | Adding StackWidget sample codeAdam Cohen2011-02-101-0/+2
* | | | | am 40683904: am 5f3cd3ea: Merge "Associated changes for \'Adding sample for c...Winson Chung2011-02-111-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Associated changes for 'Adding sample for collection widgets backed by conten...Winson Chung2011-02-111-0/+2
| |/ / /
* | | | am b8d74fd9: am 8635908d: Merge "Update resources data JSON, sample screensho...Roman Nurik2011-02-071-2/+2
|\ \ \ \ | |/ / /
| * | | Merge "Update resources data JSON, sample screenshot, and SDK makefile for Ho...Roman Nurik2011-02-071-2/+2
| |\ \ \
| | * | | Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb...Roman Nurik2011-02-071-2/+2
* | | | | am 236e9db9: am 62e97010: enable javadoc filtering for api level 11 and disab...Scott Main2011-02-071-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | enable javadoc filtering for api level 11 and disable preview doc modeScott Main2011-02-071-3/+3
| |/ / /
| * | | Merge ba3dd323 from gingerbreadJean-Baptiste Queru2011-01-291-0/+1
| |\ \ \ | | |/ /
* | | | am 796f1af0: Merge "resolved conflicts for merge of 77ba255e to honeycomb-plu...Scott Main2011-01-261-0/+1
|\ \ \ \
| * \ \ \ resolved conflicts for merge of 77ba255e to honeycomb-plus-aospScott Main2011-01-261-0/+1
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | enable preview mode for docs and add api level 10 flag for api level diffsScott Main2011-01-261-1/+6
* | | | New APIs for USB host support:Mike Lockwood2011-01-221-0/+1
|/ / /
* | | Doc change: adding missing samplesRobert Ly2011-01-191-4/+6
* | | Added Honeycomb-Gallery to docs.Alexander Lucas2011-01-191-0/+2
* | | Refactoring app widgets to address security/performance issues.Winson Chung2011-01-181-0/+1
* | | set sdk version to "Android 3.0" and api level to "Honeycomb"Scott Main2011-01-171-4/+3
* | | Import libcore_to_document definition from libcore/Docs.mkBrian Carlstrom2011-01-051-11/+2
* | | resolved conflicts for merge of 28e8c66d to masterNick Pelly2010-12-061-2/+1
|\ \ \ | |/ /
| * | Merge branch gingerbread-nfc into gingerbread.Nick Pelly2010-12-051-2/+1
| |\ \
| | * | Secure Element access implementationDaniel Tomas2010-11-191-0/+1
| | * | Rough first pass at the NFC technology API.Jeff Hamilton2010-11-191-2/+0
* | | | am f4c2eaf2: am 47ccfcb0: Doc change: add AccelerometerPlay to the generated ...Dirk Dougherty2010-11-291-0/+2
|\ \ \ \ | |/ / /
| * | | Doc change: add AccelerometerPlay to the generated samples.Dirk Dougherty2010-11-291-0/+2
* | | | am cb1af77f: am b1150edc: Remove HeavyWeight sample from generated html samples.Dirk Dougherty2010-11-291-2/+0
|\ \ \ \ | |/ / /
| * | | Remove HeavyWeight sample from generated html samples.Dirk Dougherty2010-11-291-2/+0
| | |/ | |/|
* | | docs: add preview sdk docs to provide an api overview and install steps,Scott Main2010-11-291-6/+3
* | | am d3f19b86: am 210e9c4a: Merge "Revert "Disabling AccessibilityService sampl...Trevor Johns2010-11-241-0/+2
|\ \ \ | |/ /
| * | Revert "Disabling AccessibilityService sample from build system."Trevor Johns2010-11-241-0/+2
* | | am 4f3c40cc: am 8fac7c2e: change sdk version variable to 2.3 (for docs)Scott Main2010-11-221-1/+1
|\ \ \ | |/ /
| * | change sdk version variable to 2.3 (for docs)Scott Main2010-11-221-1/+1
| * | Fixing build (DO NOT MERGE)Megha Joshi2010-11-121-1/+1
| * | Adding NFC sample resources (DO NOT MERGE)Megha Joshi2010-11-121-0/+2
| |/