openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
10,956 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

10956 Commits

Author SHA1 Message Date
The Android Open Source Project 7d091828d9 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I98737a9d0c206077d1faac71b40a14157f575d82
 2012-12-05 11:08:38 -08:00
The Android Automerger 2f74b6d8cc JDP66 2012-12-05 10:28:18 -08:00
The Android Automerger f2f1d7f8f2 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-05 10:27:36 -08:00
The Android Automerger 582c34b60e JDP65 2012-12-04 20:00:08 -08:00
The Android Automerger 1de9eda618 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-04 19:58:36 -08:00
Chris Wren f28aae60ad am abc791fc: am 801a0792: Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev 
* commit 'abc791fc5723bee48763a67a497ae25ac203b65b':
  unbundle photo dreams into the GalleryGoogle package
 2012-12-03 17:59:25 -08:00
Chris Wren abc791fc57 am 801a0792: Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev 
* commit '801a079269d78e29c105462518dd4876dd031b2e':
  unbundle photo dreams into the GalleryGoogle package
 2012-12-03 17:56:51 -08:00
Chris Wren 801a079269 Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev 2012-12-03 17:54:34 -08:00
Ying Wang d3a561da10 am f8b804f8: Merge "Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true" 
* commit 'f8b804f8c532c6d913d8389f9a8e4c05a8f0310c':
  Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true
 2012-12-03 16:07:25 -08:00
Ying Wang f8b804f8c5 Merge "Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true" 2012-12-03 16:00:27 -08:00
The Android Open Source Project b1ba5ec9cf Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I1dacc7eb56c438ce9ab211ebdc1b19860bddc0c9
 2012-12-03 15:58:04 -08:00
The Android Automerger 6d302128db JDP64B 2012-12-03 15:54:56 -08:00
The Android Automerger e21aec999d merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-03 15:54:17 -08:00
Ying Wang 96aa714534 Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true 
Change-Id: Id516716eaa90534f1b51133d5fb97468e52802dd
 2012-12-03 15:49:13 -08:00
Jean-Baptiste Queru 0f4e3718df Merge d2e4c25e 
Change-Id: I7d92c594498f6b4c8277d3a54d54b9724da04408
 2012-12-03 14:46:37 -08:00
Dianne Hackborn d2e4c25e3f am b7157909: Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev 
* commit 'b7157909185968064db922bff6d7b1baabe305f4':
  Obviously JB MR1.1 should be Android 4.2.2.
 2012-12-03 14:26:03 -08:00
Dianne Hackborn b715790918 Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev 2012-12-03 14:24:04 -08:00
Robert Ly 70b80f2a9e am 7bfd28d7: am 4bfc9991: am 5c0f9e99: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev 
* commit '7bfd28d74468845b5d2ef0db7753ef1e0075a575':
  fix docs.js bug where changeApiLevel is getting called
 2012-12-03 13:03:41 -08:00
Robert Ly b1202d1512 am 54c59287: am fd3b957b: am f88a53d5: Merge "docs: support google css class for reference docs" into jb-mr1-dev 
* commit '54c59287722c354f7a8d326e8d5d144cef715b6e':
  docs: support google css class for reference docs
 2012-12-03 13:03:40 -08:00
Robert Ly 7bfd28d744 am 4bfc9991: am 5c0f9e99: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev 
* commit '4bfc9991b49fe2e4e2e77b61c4abe7e38eea6777':
  fix docs.js bug where changeApiLevel is getting called
 2012-12-03 13:00:45 -08:00
Robert Ly 54c5928772 am fd3b957b: am f88a53d5: Merge "docs: support google css class for reference docs" into jb-mr1-dev 
* commit 'fd3b957b4a63504e31801367056a0fb954e15c9c':
  docs: support google css class for reference docs
 2012-12-03 13:00:44 -08:00
Robert Ly 4bfc9991b4 am 5c0f9e99: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev 
* commit '5c0f9e996a819806e5f088ded011bd30ef9c46d7':
  fix docs.js bug where changeApiLevel is getting called
 2012-12-03 12:59:24 -08:00
Robert Ly fd3b957b4a am f88a53d5: Merge "docs: support google css class for reference docs" into jb-mr1-dev 
* commit 'f88a53d5c309adca37210b86e5eb88a4c2706406':
  docs: support google css class for reference docs
 2012-12-03 12:59:24 -08:00
Robert Ly 5c0f9e996a Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev 2012-12-03 12:58:15 -08:00
Robert Ly f88a53d5c3 Merge "docs: support google css class for reference docs" into jb-mr1-dev 2012-12-03 12:57:50 -08:00
Robert Ly 67d75f16f4 fix docs.js bug where changeApiLevel is getting called 
Change-Id: Ic250afc792d7e4174bd987ce31df384dad3831ca
 2012-12-03 12:55:48 -08:00
Scott Main b1fb441713 am f8ea5ec7: am 838b0856: am df08adae: docs: add "Google Services" search tab 
* commit 'f8ea5ec7cd4a20d4d0c56e12a790fc7b00dd42eb':
  docs: add "Google Services" search tab
 2012-12-03 11:57:24 -08:00
Scott Main f8ea5ec7cd am 838b0856: am df08adae: docs: add "Google Services" search tab 
* commit '838b0856405949c03bd27f08441755055d2b4b89':
  docs: add "Google Services" search tab
 2012-12-03 11:55:05 -08:00
Scott Main 838b085640 am df08adae: docs: add "Google Services" search tab 
* commit 'df08adae5b003bfb056341254c35a16ec9295afe':
  docs: add "Google Services" search tab
 2012-12-03 11:53:28 -08:00
Robert Ly 06884f596c docs: support google css class for reference docs 
Change-Id: I64e5dc14feb7f045c380e108b6afe44d7b1c8004
 2012-12-03 11:50:38 -08:00
The Android Open Source Project b0dd273382 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I297fc033ce22b086d98c050e91c8c2dc262c56c9
 2012-12-03 11:33:55 -08:00
Dianne Hackborn aa48e74b60 Obviously JB MR1.1 should be Android 4.2.2. 
Change-Id: I148817d22d50672a7f204809d11aaf7f0a8af28b
 2012-12-03 11:07:37 -08:00
Scott Main df08adae5b docs: add "Google Services" search tab 
Change-Id: I624f99aeb2f760d646f37d783ebb31b5d7d372b8
 2012-12-03 08:54:37 -08:00
Chris Wren d2827ae0a8 unbundle photo dreams into the GalleryGoogle package 
Bug: 7559766
Change-Id: I805ba625b6bfc4378ffabfa1d09edab1930dc913
 2012-12-03 11:36:55 -05:00
The Android Automerger dc64b2eb71 JDP64 2012-12-03 06:08:05 -08:00
The Android Automerger e4ac051c63 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-03 06:06:24 -08:00
The Android Automerger 58089996ac JDP60E 2012-12-01 17:21:58 -08:00
Scott Main 2a2eb040a6 am a5d5c010: am 408067be: am 8fa5351c: show build info only for android docs (not google) 
* commit 'a5d5c0101052b6fb468233a5bbfe075527c2018b':
  show build info only for android docs (not google)
 2012-11-30 20:26:54 -08:00
Scott Main a5d5c01010 am 408067be: am 8fa5351c: show build info only for android docs (not google) 
* commit '408067be215fa98ecad4de0aea2c080417c4e4f1':
  show build info only for android docs (not google)
 2012-11-30 20:25:19 -08:00
Scott Main 408067be21 am 8fa5351c: show build info only for android docs (not google) 
* commit '8fa5351cba16dcac5640f6e0cce794f29e1034f9':
  show build info only for android docs (not google)
 2012-11-30 20:23:11 -08:00
Scott Main 8fa5351cba show build info only for android docs (not google) 
Change-Id: I318f4f68147c109c119ed1fc05c2429ecc7289b7
 2012-11-30 20:19:37 -08:00
The Android Automerger b1110e6ffb JDP60D 2012-11-30 16:19:57 -08:00
Dirk Dougherty 3e847379aa am 6e181e99: am 2b61bc38: am e0dceabd: Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev 
* commit '6e181e99423757cfaa4ab393461c8f1d392c7bb7':
  Doc template change: exclude articles from logic to add "prev/next" nav in training docs.
 2012-11-30 15:46:07 -08:00
Scott Main da65c4c302 am cdb4807e: am 0504ec1e: am ac71b2b5: docs: revisions for google reference nav 
* commit 'cdb4807e64ae8ab200e5a1b61b238ee186826a83':
  docs: revisions for google reference nav
 2012-11-30 15:44:14 -08:00
Dirk Dougherty 6e181e9942 am 2b61bc38: am e0dceabd: Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev 
* commit '2b61bc38ee3221446a62314f8e830e0228026e86':
  Doc template change: exclude articles from logic to add "prev/next" nav in training docs.
 2012-11-30 15:43:14 -08:00
Scott Main cdb4807e64 am 0504ec1e: am ac71b2b5: docs: revisions for google reference nav 
* commit '0504ec1e80d6eb40fa9b7d3a25da9f9b82b703aa':
  docs: revisions for google reference nav
 2012-11-30 15:41:14 -08:00
Dirk Dougherty 2b61bc38ee am e0dceabd: Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev 
* commit 'e0dceabdd8a4f56ebf7ae1429350d350bac6d812':
  Doc template change: exclude articles from logic to add "prev/next" nav in training docs.
 2012-11-30 15:40:55 -08:00
Dirk Dougherty e0dceabdd8 Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev 2012-11-30 15:39:03 -08:00
Scott Main 0504ec1e80 am ac71b2b5: docs: revisions for google reference nav 
* commit 'ac71b2b59bae525502ae0b7af93b5f3a9f569b47':
  docs: revisions for google reference nav
 2012-11-30 15:29:40 -08:00
The Android Open Source Project 097eaf9026 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I3e6dea054ed56ef2477198ee2082f97433d359c2
 2012-11-30 14:59:45 -08:00