Commit Graph

4071 Commits

Author SHA1 Message Date
Scott Main 706408ea9f am 1a35a101: am 4c8ae40a: docs: remove preliminary watermark from docs
* commit '1a35a101ada24a0fa5220dc695f458cf248c814f':
  docs: remove preliminary watermark from docs
2011-02-07 15:37:00 -08:00
Scott Main 1a35a101ad am 4c8ae40a: docs: remove preliminary watermark from docs
* commit '4c8ae40abba83921bd98eb6636b5e3d753bbd183':
  docs: remove preliminary watermark from docs
2011-02-07 15:34:50 -08:00
Scott Main 4c8ae40abb docs: remove preliminary watermark from docs
Change-Id: I452596cdc5b87effdb958ff963d9aa80ebec5d37
2011-02-07 14:26:45 -08:00
Scott Main c4305eefe3 am 2f2a43cd: am 61281638: am 886e5aa7: Merge "fix api level filtering script to compare integers, not strings" into gingerbread
* commit '2f2a43cd92842dd38d20f95db1998c60da0c34dd':
  fix api level filtering script to compare integers, not strings
2011-02-07 13:47:26 -08:00
Raphael 038c9805e7 am 77c1e67b: (-s ours) am 3e01b483: (-s ours) am 843c6e25: merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
* commit '77c1e67b876b0d486d0056e418889117d8093093':
  merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
2011-02-07 13:47:24 -08:00
Scott Main 3fbd3207f2 am 053f5491: am 4b311bc9: Merge "fix api level filtering script to compare integers, not strings" into honeycomb
* commit '053f5491340f5bacddd9943521c8f1b1d0c0bb6a':
  fix api level filtering script to compare integers, not strings
2011-02-07 13:47:05 -08:00
Scott Main 6f963b3930 am c52832ad: am 8cf6d9e3: Merge "tweak header css for more distinction" into honeycomb
* commit 'c52832ad5c5ac994f6e49de14c6e9f43da997d32':
  tweak header css for more distinction
2011-02-07 13:45:10 -08:00
Raphael 59f7b629bc am 0a7ed4af: am 30e07075: SDK: stub the maps.jar from the google_apis addon.
* commit '0a7ed4af97bdd52be96d8c9db1eff3fa4d6dc843':
  SDK: stub the maps.jar from the google_apis addon.
2011-02-07 13:44:26 -08:00
Scott Main 2f2a43cd92 am 61281638: am 886e5aa7: Merge "fix api level filtering script to compare integers, not strings" into gingerbread
* commit '612816385a5c6ca2bd54d027617c42c34338682f':
  fix api level filtering script to compare integers, not strings
2011-02-04 15:20:42 -08:00
Raphael 77c1e67b87 am 3e01b483: (-s ours) am 843c6e25: merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
* commit '3e01b483708d0fc3766fa4adff2ae8b354de75dc':
  merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
2011-02-04 15:20:36 -08:00
Scott Main 053f549134 am 4b311bc9: Merge "fix api level filtering script to compare integers, not strings" into honeycomb
* commit '4b311bc91a7851b204c63e678b0213504125d3aa':
  fix api level filtering script to compare integers, not strings
2011-02-04 15:17:04 -08:00
Scott Main 612816385a am 886e5aa7: Merge "fix api level filtering script to compare integers, not strings" into gingerbread
* commit '886e5aa742c1667de3ca5b628bf6865948ef4513':
  fix api level filtering script to compare integers, not strings
2011-02-04 15:14:57 -08:00
Scott Main 4b311bc91a Merge "fix api level filtering script to compare integers, not strings" into honeycomb 2011-02-04 15:14:45 -08:00
Scott Main 11057f5a0a fix api level filtering script to compare integers, not strings
Change-Id: I8f0e44ec2bf0833a0d547a3795ee31ee0dc69d8a
2011-02-04 15:13:04 -08:00
Scott Main 886e5aa742 Merge "fix api level filtering script to compare integers, not strings" into gingerbread 2011-02-04 15:11:59 -08:00
Scott Main af2ba51ed5 fix api level filtering script to compare integers, not strings
Change-Id: I4d0d6c40dd5c1f8470567ef30f0f7500b442fbe5
2011-02-04 15:10:33 -08:00
Raphael 3e01b48370 am 843c6e25: merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
* commit '843c6e2530a0783ae1a5a4758cb5e76ad975ae72':
  merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
2011-02-04 14:49:17 -08:00
Raphael 843c6e2530 merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
Depends on change 8252cdea from development to get the
verbose/quiet flag for mkstub.

Change-Id: I1ac97023570a4fc8a0b9dd50db429c55184ec88c
2011-02-04 12:34:54 -08:00
Scott Main c52832ad5c am 8cf6d9e3: Merge "tweak header css for more distinction" into honeycomb
* commit '8cf6d9e3ae1f7a18c49121c578fe1f5f05371342':
  tweak header css for more distinction
2011-02-04 11:48:59 -08:00
Scott Main 8cf6d9e3ae Merge "tweak header css for more distinction" into honeycomb 2011-02-04 11:47:18 -08:00
Raphael 0a7ed4af97 am 30e07075: SDK: stub the maps.jar from the google_apis addon.
* commit '30e0707531268343e11dfeb51f28ccdacd7f9875':
  SDK: stub the maps.jar from the google_apis addon.
2011-02-04 11:12:25 -08:00
Glenn Kasten 043b9d4b3d Merge "Bug 3366885 Remove LVMX" 2011-02-04 08:42:11 -08:00
Raphael 30e0707531 SDK: stub the maps.jar from the google_apis addon.
Depends on change 8252cdea from development to get the
verbose/quiet flag for mkstub.

Change-Id: I5f4e766613576828147c97be8d38e97fe1035672
2011-02-03 23:00:49 -08:00
Scott Main a16d7d8ad3 tweak header css for more distinction
Change-Id: I1d63b7587917bfde3df5547b5648610d86083d6a
2011-02-03 19:30:48 -08:00
Glenn Kasten 18315876c8 Bug 3366885 Remove LVMX
Change-Id: If35e28c44a4ccc3e1a777e95f2551cf5d6552f12
2011-02-03 18:24:59 -08:00
Raphael Moll 16166e5727 am 5c6069d6: am ed191898: am a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"
* commit '5c6069d632b3019c74de57b5d89a4e90d2b59759':
  SDK: Enable "make sdk/common" under Windows
2011-02-03 18:07:50 -08:00
Raphael 6758820550 am 004f68f0: am 79e1d2cf: am 6b6e8114: am 4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."
* commit '004f68f01c410f33fbeb44313597ee97b1f17a86':
  SDK: Strip llvm-rs-cc in SDK.
2011-02-03 17:17:55 -08:00
Raphael Moll 5c6069d632 am ed191898: am a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"
* commit 'ed19189877a3a380074e8e76969ef23689cec8fd':
  SDK: Enable "make sdk/common" under Windows
2011-02-03 11:45:21 -08:00
Raphael Moll ed19189877 am a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"
* commit 'a15717c9905e32f2724645e3734567c40d8d3eb0':
  SDK: Enable "make sdk/common" under Windows
2011-02-03 11:42:34 -08:00
Raphael Moll a15717c990 am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"
* commit '6b7b53cb36bda3b2aa1de94654cd73785d67c267':
  SDK: Enable "make sdk/common" under Windows
2011-02-03 10:54:05 -08:00
Raphael Moll 6b7b53cb36 Merge "SDK: Enable "make sdk/common" under Windows" 2011-02-03 10:45:50 -08:00
Jean-Baptiste Queru 4b35d1aba0 Fix x86 build.
Change-Id: I22dc39a68911e1b5846c20e63c0f8c59521ea7f5
2011-02-03 09:55:47 -08:00
Raphael 004f68f01c am 79e1d2cf: am 6b6e8114: am 4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."
* commit '79e1d2cf99754f81137c0f390d0e1fd898e52277':
  SDK: Strip llvm-rs-cc in SDK.
2011-02-03 09:16:38 -08:00
Raphael 79e1d2cf99 am 6b6e8114: am 4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."
* commit '6b6e8114810bb26a64e1d8d9814fdfadb90c3848':
  SDK: Strip llvm-rs-cc in SDK.
2011-02-03 09:05:07 -08:00
Raphael 6b6e811481 am 4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."
* commit '4167b2bae58b445cfaf15291a7aa6b0ccd025596':
  SDK: Strip llvm-rs-cc in SDK.
2011-02-03 08:56:22 -08:00
Brian Swetland a0c5bd7b4a am 70c822e7: am 678c7ac9: (-s ours) am d7798a7e: fix TINY ANDROID yet again...
* commit '70c822e7106ac97a1a2b4e5d404e54efc34ad344':
  fix TINY ANDROID yet again...
2011-02-02 16:25:01 -08:00
Raphael ea55056f19 am 3e57da17: am 7a6a9c35: SDK: Strip llvm-rs-cc in SDK.
* commit '3e57da17d1bd1e61c440910fbb441ba6997314d9':
  SDK: Strip llvm-rs-cc in SDK.
2011-02-02 16:20:08 -08:00
Brian Swetland 70c822e710 am 678c7ac9: (-s ours) am d7798a7e: fix TINY ANDROID yet again...
* commit '678c7ac997ba5daf09664d3e9b26f1c4a493b99e':
  fix TINY ANDROID yet again...
2011-02-02 16:17:50 -08:00
Raphael Moll 192d1ef6d7 SDK: Enable "make sdk/common" under Windows
Change-Id: Id9cba159f434fb18f6e3b648954b3f8ddb580dc0
2011-02-02 15:59:46 -08:00
Raphael 3e57da17d1 am 7a6a9c35: SDK: Strip llvm-rs-cc in SDK.
* commit '7a6a9c3528d997a1cb3a03eca3c0c11b14792449':
  SDK: Strip llvm-rs-cc in SDK.
2011-02-02 15:52:40 -08:00
Brian Swetland 678c7ac997 am d7798a7e: fix TINY ANDROID yet again...
* commit 'd7798a7e1b3241c49d7c8325cf14ac608350b719':
  fix TINY ANDROID yet again...
2011-02-02 15:23:20 -08:00
Brian Swetland d7798a7e1b fix TINY ANDROID yet again...
Change-Id: If52e1387c590be5ef467280ab2d1b56b8a823cd0
2011-02-02 15:20:50 -08:00
Raphael 4167b2bae5 Merge "SDK: Strip llvm-rs-cc in SDK." 2011-02-02 13:41:14 -08:00
Ed Heyl 9eec524e0a am 6ae30f98: Merge commit \'1eda8628\' into honeycomb-plus-aosp
* commit '6ae30f989d8da512924e954be4e7ef692d2b9a18':
  set ID back to honeycomb       (please do not merge)
2011-02-02 13:20:06 -08:00
Ed Heyl 6ae30f989d Merge commit '1eda8628' into honeycomb-plus-aosp
Change-Id: I07948d5d76f4a25ae93ebd6c7ba0d520ef5b61c0
2011-02-02 13:12:31 -08:00
Raphael 7a6a9c3528 SDK: Strip llvm-rs-cc in SDK.
SDK Bug: 3394374

Change-Id: I2b0e46d9f94d488611bd79193f4a11cc0f36be51
2011-02-02 12:05:31 -08:00
Raphael 39f4b566da SDK: Strip llvm-rs-cc in SDK.
SDK Bug: 3394374

Change-Id: I728112795ad40a31a1b4c476e043ef213241c617
2011-02-02 11:31:38 -08:00
Ed Heyl 1eda86286a set ID back to honeycomb (please do not merge)
Change-Id: I469ccbb2a556d3aeaedb9d0a89bda1d77aef6b90
2011-02-02 10:04:50 -08:00
Scott Main 6a1ca8b804 am 070336f3: am 463694a4: (-s ours) am 0fe9974c: cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
* commit '070336f3a83680245517688e008254166cbaa6d8':
  cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
2011-02-01 21:02:30 -08:00
Scott Main 070336f3a8 am 463694a4: (-s ours) am 0fe9974c: cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
* commit '463694a4f54de3d16de21b7aa9a7030b73fbd2e5':
  cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
2011-02-01 21:00:05 -08:00