summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of a06ad953 to masterChung-yih Wang2010-08-061-0/+5
|\
| * Add SIP service into system server.Chung-yih Wang2010-08-061-0/+5
| * Tracking merge of dalvik-dev to gingerbreadBrian Carlstrom2010-08-041-24/+5
* | First pass at a new clipboard API.Dianne Hackborn2010-08-051-1/+2
* | add droiddoc flag for honeycomb apis (for reference filtering)Scott Main2010-08-041-0/+1
* | Add new system service CountryDetectorBai Tao2010-07-281-0/+2
* | resolved conflicts for merge of bc54e63c to masterMathias Agopian2010-07-211-1/+0
|\ \ | |/
| * new SensorServiceMathias Agopian2010-07-191-1/+0
* | Initial changes to allow collections in widgets.Winson Chung2010-07-191-0/+1
* | am 92a47ea3: am 562124e8: Merge "Clean up some style in the makefiles." into ...Joe Onorato2010-07-151-7/+7
|\ \ | |/
| * Clean up some style in the makefiles.Joe Onorato2010-07-141-7/+7
* | frameworks/base updates to track merge from dalvik-devBrian Carlstrom2010-06-301-1/+2
* | New XmlAdapters sample code.Gilles Debunne2010-06-251-1/+3
* | Reimplement the PhoneNumberFormattingTextWatcherBai Tao2010-06-101-2/+6
* | am 420e7ec7: am fef42db9: Add sample code.Dianne Hackborn2010-06-041-2/+4
|\ \ | |/
| * Add sample code.Dianne Hackborn2010-06-041-2/+4
* | am 12cd606d: am 0cbda99f: The status bar draws its icons now.Joe Onorato2010-06-021-2/+2
|\ \ | |/
| * The status bar draws its icons now.Joe Onorato2010-06-021-2/+2
* | am 627cfa94: am 90233a1e: Add IStatusBarJoe Onorato2010-06-021-1/+1
|\ \ | |/
| * Add IStatusBarJoe Onorato2010-06-021-1/+1
* | am e0b2ae11: am 25f95f92: Rename IStatusBar to IStatusBarService.Joe Onorato2010-06-021-1/+1
|\ \ | |/
| * Rename IStatusBar to IStatusBarService.Joe Onorato2010-06-021-1/+1
* | am 2cbaf806: am 2314aab5: First pass at splitting the status bar for the diff...Joe Onorato2010-06-021-0/+1
|\ \ | |/
| * First pass at splitting the status bar for the different devices.Joe Onorato2010-06-021-0/+1
| * disable emma instrumentation for framework, ext and services (DO NOT MERGE)Guang Zhu2010-05-181-0/+6
* | Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-masterBrian Carlstrom2010-05-271-23/+3
* | am c4a9383d: am 626db910: Store the list of source directories for the SDK.Joe Onorato2010-05-171-0/+4
|\ \ | |/
| * Store the list of source directories for the SDK.Joe Onorato2010-05-171-0/+4
* | am 0b6e30d2: am c5859388: am 3e9e9696: am eb9cbb8f: Resurrect flashlight supp...Mike Lockwood2010-05-171-1/+2
|\ \ | |/
| * am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder...Mike Lockwood2010-05-171-1/+2
| |\
| | * Resurrect flashlight support in obsolete IHardwareService Binder API.Mike Lockwood2010-05-171-1/+2
* | | am cef60007: am aef87aa9: am c6b7a2d7: am d1e9d590: Doc change: add sizes/sum...Dirk Dougherty2010-05-171-2/+2
|\ \ \ | |/ /
| * | am d1e9d590: Doc change: add sizes/sums for sdk/ndk/adt packages.Dirk Dougherty2010-05-141-2/+2
| |\ \ | | |/
| | * Doc change: add sizes/sums for sdk/ndk/adt packages.Dirk Dougherty2010-05-141-2/+2
* | | Moving junit out of core.jar and into core-junit.jar.Jesse Wilson2010-05-121-1/+1
* | | am b796d698: am dd142ac3: am 052e2102: am 0d1b0814: Doc change: updates for n...Dirk Dougherty2010-05-121-5/+5
|\ \ \ | |/ /
| * | am 0d1b0814: Doc change: updates for new tools, platform, adt versions. Misc ...Dirk Dougherty2010-05-121-5/+5
| |\ \ | | |/
| | * Doc change: updates for new tools, platform, adt versions. Misc other fixes u...Dirk Dougherty2010-05-111-5/+5
* | | am 2ecef59c: am 0ab047c7: am 769612e1: am b32c2402: Doc change: add toc refer...Dirk Dougherty2010-05-111-0/+4
|\ \ \ | |/ /
| * | am b32c2402: Doc change: add toc references to tictactoe sample apps and scre...Dirk Dougherty2010-05-111-0/+4
| |\ \ | | |/
| | * Doc change: add toc references to tictactoe sample apps and screen shots.Dirk Dougherty2010-05-101-0/+4
* | | am cd2fa84a: am 9d5b754b: am 717e135c: am 62c28cae: Merge "docs: change Searc...Scott Main2010-05-101-1/+1
|\ \ \ | |/ /
| * | am 62c28cae: Merge "docs: change SearchableDictionary to "v2" and remove old ...Scott Main2010-05-101-1/+1
| |\ \ | | |/
| | * docs: change SearchableDictionary to "v2" and remove old "new" superscripts f...Scott Main2010-05-071-1/+1
| * | am 0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hel...Dirk Dougherty2010-05-101-0/+4
| |\ \ | | |/
| | * Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorial...Joe Malin2010-05-071-0/+4
| * | Adapt to new location of libcoreJean-Baptiste Queru2010-04-301-2/+2
| |/
* | Add framework.aidl as prerequisite of api-stubsYing Wang2010-05-071-1/+2
* | Doc Change: Activity Testing/Hello, Testing tutorials doc filesJoe Malin2010-05-041-0/+4
* | Adapt to new location of libcoreJean-Baptiste Queru2010-04-301-2/+2