summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of b7bba718 to masterCraig Mautner2013-12-191-0/+2
|\
| * Pair ActivityStacks with DisplaysCraig Mautner2013-12-181-0/+2
| * am dcbde1b0: Merge "libcore_to_document and junit_to_document are no longer f...Ying Wang2013-12-051-2/+2
| |\
| | * libcore_to_document and junit_to_document are no longer functions.Ying Wang2013-12-041-2/+2
* | | Adding INfcUnlockSettings and NfcUnlock interface class.Andres Morales2013-12-091-0/+1
* | | libcore_to_document and junit_to_document are no longer functions.Ying Wang2013-12-041-2/+2
* | | am 713e3853: am 0b492138: am 6000f1ed: Re-enable samples browser.Dirk Dougherty2013-11-231-4/+4
|\ \ \ | |/ /
| * | am 6000f1ed: Re-enable samples browser.Dirk Dougherty2013-11-231-4/+4
| |\ \
| | * | Re-enable samples browser.Dirk Dougherty2013-11-221-4/+4
* | | | am a6703462: am a0501105: am 9eaa9443: Disable samples browsing temporarily.Dirk Dougherty2013-11-221-4/+4
|\ \ \ \ | |/ / /
| * | | am 9eaa9443: Disable samples browsing temporarily.Dirk Dougherty2013-11-221-4/+4
| |\ \ \ | | |/ /
| | * | Disable samples browsing temporarily.Dirk Dougherty2013-11-221-4/+4
* | | | am 3ee2c60e: am 8b5da356: am 1448d3cd: Merge "Pass a new samplesdir param to ...Dirk Dougherty2013-11-221-162/+4
|\ \ \ \ | |/ / /
| * | | am 1448d3cd: Merge "Pass a new samplesdir param to doclava as the starting po...Dirk Dougherty2013-11-221-162/+4
| |\ \ \ | | |/ /
| | * | Pass a new samplesdir param to doclava as the starting point for generating s...Dirk Dougherty2013-11-211-162/+4
* | | | am 3d763e25: am a9a39d6c: am acca12fa: Merge "Doc change: move localized file...Dirk Dougherty2013-11-191-2/+2
|\ \ \ \ | |/ / /
| * | | am acca12fa: Merge "Doc change: move localized files into an intl dir. Build ...Dirk Dougherty2013-11-201-2/+2
| |\ \ \ | | |/ /
| | * | Doc change: move localized files into an intl dir. Build output remains the s...Dirk Dougherty2013-11-191-2/+2
* | | | Add ThirdPartyCall APIs to masterSailesh Nepal2013-11-131-0/+3
* | | | am c2b652fd: am 5182ea4b: am d40a4d74: Merge "Add media router service and in...Jeff Brown2013-11-071-0/+2
|\ \ \ \ | |/ / /
| * | | am d40a4d74: Merge "Add media router service and integrate with remote displa...Jeff Brown2013-11-071-0/+2
| |\ \ \
| | * \ \ Merge "Add media router service and integrate with remote displays." into klp...Jeff Brown2013-11-081-0/+2
| | |\ \ \
| | | * | | Add media router service and integrate with remote displays.Jeff Brown2013-11-071-0/+2
* | | | | | am 84d76025: am eb223425: am 1f7a8a06: Merge "Add a platform library for remo...Jeff Brown2013-11-071-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 1f7a8a06: Merge "Add a platform library for remote display providers." int...Jeff Brown2013-11-071-0/+2
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| | * | | Merge "Add a platform library for remote display providers." into klp-devJeff Brown2013-11-081-0/+2
| | |\ \ \ | | | |/ /
| | | * | Add a platform library for remote display providers.Jeff Brown2013-11-071-0/+2
* | | | | am 40730533: am f7188557: am 03ec3428: fix buildScott Main2013-11-061-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | fix buildScott Main2013-11-011-1/+1
* | | | | am 5cfa3fcb: am d183aae9: am 4cf4f521: add storage provider sample to buildScott Main2013-11-061-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | add storage provider sample to buildScott Main2013-11-011-3/+3
| * | | | Enable samples browsing in builds.Dirk Dougherty2013-10-311-4/+6
* | | | | am 65fe1908: am b2a905f0: am d51578ee: Merge "Enable samples browsing in buil...Dirk Dougherty2013-10-311-4/+6
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Enable samples browsing in builds.Dirk Dougherty2013-10-301-4/+6
| |/ / /
* | | | am ad064dac: am 52de9b52: am fd391d6f: Merge "Doc change: add new list of bro...Dirk Dougherty2013-10-291-15/+71
|\ \ \ \ | |/ / /
| * | | Doc change: add new list of browseable samples and sample groups.Dirk Dougherty2013-10-291-15/+71
| |/ /
* | | am 8a51e2f4: am a53e1f81: am 23757527: Merge "Hide the print dialog if the pr...Svetoslav Ganov2013-10-181-0/+1
|\ \ \ | |/ /
| * | Hide the print dialog if the printing activity is destroyed.Svetoslav Ganov2013-10-181-0/+1
| |/
* | am 5c880d0d: am 6f688e87: am 8f34715b: Merge "Refactor how the print dialog a...Svetoslav2013-10-111-1/+0
|\ \ | |/
| * Refactor how the print dialog activity is started.Svetoslav2013-10-111-1/+0
* | am 856441e7: am 920de6c6: am 332408f8: update version number for doc stampScott Main2013-10-041-1/+1
|\ \ | |/
| * update version number for doc stampScott Main2013-10-041-1/+1
* | am 2cf2948d: am 3f90705a: am 795b6e42: Merge "add -since flag for api level 1...Scott Main2013-10-041-0/+1
|\ \ | |/
| * add -since flag for api level 19 to filter javadocsScott Main2013-10-031-0/+1
* | am 65cacb3c: Merge "Add android.provider.Telephony to public API." into klp-devJake Hamby2013-10-011-0/+1
|\ \ | |/
| * Merge "Add android.provider.Telephony to public API." into klp-devJake Hamby2013-09-301-0/+1
| |\
| | * Add android.provider.Telephony to public API.Jake Hamby2013-09-241-0/+1
* | | Supress contents of this project in embedded buildsMike Lockwood2013-09-301-0/+6
* | | am 4609d9a9: am 5cab967b: Merge "Adding hidden APIs for observing the print j...Svetoslav Ganov2013-09-261-0/+1
|\ \ \ | |/ /
| * | Adding hidden APIs for observing the print jobs state.Svetoslav Ganov2013-09-251-0/+1
| |/