OSDN Git Service
The Android Automerger [Wed, 12 Dec 2012 07:59:23 +0000 (23:59 -0800)]
JDP72B
The Android Automerger [Tue, 11 Dec 2012 23:57:10 +0000 (15:57 -0800)]
JDP72
The Android Automerger [Tue, 11 Dec 2012 23:56:16 +0000 (15:56 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Tue, 11 Dec 2012 03:34:09 +0000 (19:34 -0800)]
JDP71B
The Android Automerger [Tue, 11 Dec 2012 03:33:28 +0000 (19:33 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Mon, 10 Dec 2012 21:06:33 +0000 (13:06 -0800)]
JDP71
The Android Automerger [Mon, 10 Dec 2012 21:05:46 +0000 (13:05 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Fri, 7 Dec 2012 21:26:40 +0000 (13:26 -0800)]
JDP68
The Android Automerger [Fri, 7 Dec 2012 21:26:02 +0000 (13:26 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Fri, 7 Dec 2012 03:36:51 +0000 (19:36 -0800)]
JDP67B
The Android Automerger [Fri, 7 Dec 2012 03:35:57 +0000 (19:35 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Thu, 6 Dec 2012 18:40:18 +0000 (10:40 -0800)]
JDP67
The Android Automerger [Thu, 6 Dec 2012 18:39:05 +0000 (10:39 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Wed, 5 Dec 2012 18:28:18 +0000 (10:28 -0800)]
JDP66
The Android Automerger [Wed, 5 Dec 2012 18:27:36 +0000 (10:27 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Wed, 5 Dec 2012 04:00:08 +0000 (20:00 -0800)]
JDP65
The Android Automerger [Wed, 5 Dec 2012 03:58:36 +0000 (19:58 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Chris Wren [Tue, 4 Dec 2012 01:54:34 +0000 (17:54 -0800)]
Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
The Android Automerger [Mon, 3 Dec 2012 23:54:56 +0000 (15:54 -0800)]
JDP64B
The Android Automerger [Mon, 3 Dec 2012 23:54:17 +0000 (15:54 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Dianne Hackborn [Mon, 3 Dec 2012 22:24:04 +0000 (14:24 -0800)]
Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev
Robert Ly [Mon, 3 Dec 2012 20:59:24 +0000 (12:59 -0800)]
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
Robert Ly [Mon, 3 Dec 2012 20:59:24 +0000 (12:59 -0800)]
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
Robert Ly [Mon, 3 Dec 2012 20:58:14 +0000 (12:58 -0800)]
Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
Robert Ly [Mon, 3 Dec 2012 20:57:50 +0000 (12:57 -0800)]
Merge "docs: support google css class for reference docs" into jb-mr1-dev
Robert Ly [Mon, 3 Dec 2012 20:53:42 +0000 (12:53 -0800)]
fix docs.js bug where changeApiLevel is getting called
Change-Id: Ic250afc792d7e4174bd987ce31df384dad3831ca
Scott Main [Mon, 3 Dec 2012 19:53:28 +0000 (11:53 -0800)]
am
df08adae: docs: add "Google Services" search tab
* commit '
df08adae5b003bfb056341254c35a16ec9295afe':
docs: add "Google Services" search tab
Robert Ly [Mon, 3 Dec 2012 19:50:38 +0000 (11:50 -0800)]
docs: support google css class for reference docs
Change-Id: I64e5dc14feb7f045c380e108b6afe44d7b1c8004
Dianne Hackborn [Fri, 30 Nov 2012 23:43:14 +0000 (15:43 -0800)]
Obviously JB MR1.1 should be Android 4.2.2.
Change-Id: I148817d22d50672a7f204809d11aaf7f0a8af28b
Scott Main [Mon, 3 Dec 2012 16:54:37 +0000 (08:54 -0800)]
docs: add "Google Services" search tab
Change-Id: I624f99aeb2f760d646f37d783ebb31b5d7d372b8
Chris Wren [Sun, 2 Dec 2012 18:57:23 +0000 (13:57 -0500)]
unbundle photo dreams into the GalleryGoogle package
Bug:
7559766
Change-Id: I805ba625b6bfc4378ffabfa1d09edab1930dc913
The Android Automerger [Mon, 3 Dec 2012 14:08:05 +0000 (06:08 -0800)]
JDP64
The Android Automerger [Mon, 3 Dec 2012 14:06:24 +0000 (06:06 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Sun, 2 Dec 2012 01:21:58 +0000 (17:21 -0800)]
JDP60E
Scott Main [Sat, 1 Dec 2012 04:23:11 +0000 (20:23 -0800)]
am
8fa5351c: show build info only for android docs (not google)
* commit '
8fa5351cba16dcac5640f6e0cce794f29e1034f9':
show build info only for android docs (not google)
Scott Main [Sat, 1 Dec 2012 04:16:42 +0000 (20:16 -0800)]
show build info only for android docs (not google)
Change-Id: I318f4f68147c109c119ed1fc05c2429ecc7289b7
The Android Automerger [Sat, 1 Dec 2012 00:19:57 +0000 (16:19 -0800)]
JDP60D
Dirk Dougherty [Fri, 30 Nov 2012 23:40:55 +0000 (15:40 -0800)]
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.
Dirk Dougherty [Fri, 30 Nov 2012 23:39:03 +0000 (15:39 -0800)]
Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev
Scott Main [Fri, 30 Nov 2012 23:29:40 +0000 (15:29 -0800)]
am
ac71b2b5: docs: revisions for google reference nav
* commit '
ac71b2b59bae525502ae0b7af93b5f3a9f569b47':
docs: revisions for google reference nav
Scott Main [Fri, 30 Nov 2012 22:40:58 +0000 (14:40 -0800)]
docs: revisions for google reference nav
Change-Id: I9befa502a3ce30ab6cca7d45ce1bb469930c14ed
The Android Automerger [Fri, 30 Nov 2012 22:56:25 +0000 (14:56 -0800)]
JDP60C
Robert Ly [Fri, 30 Nov 2012 22:34:18 +0000 (14:34 -0800)]
am
8acd75aa: add google class for body
* commit '
8acd75aa048dd294d0adce04722851de38d4dcef':
add google class for body
Robert Ly [Fri, 30 Nov 2012 22:02:43 +0000 (14:02 -0800)]
add google class for body
Change-Id: Ie809df1d207ec08ae232f4ae194959eac69ec5fb
Dirk Dougherty [Fri, 30 Nov 2012 20:44:40 +0000 (12:44 -0800)]
Doc template change: exclude articles from logic to add "prev/next" nav in training docs.
Change-Id: I384c5c5df053d9e98fa953c2e3998e7c99c08569
Scott Main [Fri, 30 Nov 2012 20:38:57 +0000 (12:38 -0800)]
am
5747d38a: enforce margin change for nolist class in training articles
* commit '
5747d38aad918e32ae485b77524b554fd4e24ae5':
enforce margin change for nolist class in training articles
Scott Main [Fri, 30 Nov 2012 20:38:56 +0000 (12:38 -0800)]
am
4e477d7b: Merge "docs/css: break words that are too long to fit sidenav; add style for google javadocs" into jb-mr1-dev
* commit '
4e477d7b9c72555efb2b3fa05b4074a0bf3718b3':
docs/css: break words that are too long to fit sidenav; add style for google javadocs
Robert Ly [Fri, 30 Nov 2012 20:38:55 +0000 (12:38 -0800)]
am
d2dd6e58: add support for gms javadocs
* commit '
d2dd6e58251e1886bd5237d04391559811cfcd66':
add support for gms javadocs
Scott Main [Fri, 30 Nov 2012 20:02:42 +0000 (12:02 -0800)]
enforce margin change for nolist class in training articles
Change-Id: I7da486d557c3d7629827d2b425fd387366bd7f18
Scott Main [Fri, 30 Nov 2012 19:32:41 +0000 (11:32 -0800)]
Merge "docs/css: break words that are too long to fit sidenav; add style for google javadocs" into jb-mr1-dev
Scott Main [Fri, 30 Nov 2012 19:27:17 +0000 (11:27 -0800)]
docs/css: break words that are too long to fit sidenav; add style for google javadocs
Change-Id: I69f062c5e1ddeafdae75e8f2ec77226aac836e48
Robert Ly [Fri, 30 Nov 2012 05:28:48 +0000 (21:28 -0800)]
add support for gms javadocs
Change-Id: Ieecf09794373a176430f554f39e1c632a7013519
The Android Automerger [Thu, 29 Nov 2012 22:01:12 +0000 (14:01 -0800)]
JDP60B
The Android Open Source Project [Thu, 29 Nov 2012 19:54:49 +0000 (11:54 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ib6d98680f4ca7dacc33209363896f2cdff2127ed
The Android Automerger [Thu, 29 Nov 2012 18:45:10 +0000 (10:45 -0800)]
JOP40E
The Android Automerger [Thu, 29 Nov 2012 15:10:53 +0000 (07:10 -0800)]
JDP60
The Android Automerger [Thu, 29 Nov 2012 15:09:13 +0000 (07:09 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Robert Ly [Thu, 29 Nov 2012 02:15:48 +0000 (18:15 -0800)]
am
40e90998: add google services tab
* commit '
40e9099805da2e91ec09c3bab79a7e825fca9d91':
add google services tab
Robert Ly [Thu, 29 Nov 2012 01:46:17 +0000 (17:46 -0800)]
add google services tab
Change-Id: Ia5b249b825c33334458a6762be2d62b657bc0d58
Scott Main [Wed, 28 Nov 2012 19:14:20 +0000 (11:14 -0800)]
am
d4cb7831: add \'external-link\' class for links that go off-site
* commit '
d4cb783159c76d0ea9423020b3ab6ec77a21506e':
add 'external-link' class for links that go off-site
Scott Main [Wed, 28 Nov 2012 19:10:09 +0000 (11:10 -0800)]
add 'external-link' class for links that go off-site
Change-Id: I9e78cd6a7cb2ce14e5e15fe43e87b55ac456f302
Robert Ly [Wed, 28 Nov 2012 01:33:27 +0000 (17:33 -0800)]
Robert Ly [Wed, 28 Nov 2012 01:27:34 +0000 (17:27 -0800)]
fix build
Change-Id: I3e98493aac48b0061d44351fb8c0f07a759b25c0
The Android Automerger [Tue, 27 Nov 2012 23:35:46 +0000 (15:35 -0800)]
JDP58
The Android Automerger [Tue, 27 Nov 2012 23:34:09 +0000 (15:34 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Scott Main [Tue, 27 Nov 2012 23:09:17 +0000 (15:09 -0800)]
am
502c939f: docs: add support for an infinite number of nested lists in side nav
* commit '
502c939f6d0818d985a45ca54e35c0a3efa1470b':
docs: add support for an infinite number of nested lists in side nav
Scott Main [Tue, 27 Nov 2012 23:00:40 +0000 (15:00 -0800)]
docs: add support for an infinite number of nested lists in side nav
Change-Id: I9e0fa672e20067f3e09f56560e7d11847d0b9388
Ying Wang [Tue, 27 Nov 2012 22:17:27 +0000 (14:17 -0800)]
am
c69b7735: Put ANDROID_BUILD_PATHS before the system default PATH
* commit '
c69b773506ecf2316059a9fe947bbeb524a402b3':
Put ANDROID_BUILD_PATHS before the system default PATH
Ying Wang [Tue, 27 Nov 2012 04:51:59 +0000 (20:51 -0800)]
Put ANDROID_BUILD_PATHS before the system default PATH
So tools like adb that are built from source won't be overridden by the
host system tools, when you run these tools without specifying the path.
Change-Id: I2f0a288b38fabf57c7a4aa3bae5e42d7b734398d
Keun young Park [Tue, 27 Nov 2012 18:52:14 +0000 (10:52 -0800)]
replace dummy versions with normal ones for mini
- no need to hide these UIs any more.
- dummy versions will be removed from the default manifest as well.
Change-Id: I7cebf5bfae65d2e50c9122735fd4e537f5858bec
The Android Open Source Project [Tue, 27 Nov 2012 15:33:15 +0000 (07:33 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ic400b5287afc2fcb3a6205e5e57aa89af6572911
The Android Automerger [Mon, 26 Nov 2012 20:23:23 +0000 (12:23 -0800)]
JDP57B
The Android Automerger [Mon, 26 Nov 2012 20:22:55 +0000 (12:22 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Mon, 26 Nov 2012 19:29:42 +0000 (11:29 -0800)]
JDP57
The Android Automerger [Mon, 26 Nov 2012 19:28:48 +0000 (11:28 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Tue, 20 Nov 2012 00:50:51 +0000 (16:50 -0800)]
JDP50B
The Android Automerger [Tue, 20 Nov 2012 00:50:33 +0000 (16:50 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Tue, 20 Nov 2012 00:13:54 +0000 (16:13 -0800)]
JDP50
The Android Automerger [Tue, 20 Nov 2012 00:12:53 +0000 (16:12 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Ed Heyl [Mon, 19 Nov 2012 22:20:48 +0000 (14:20 -0800)]
bump version to 4.2.1
Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
The Android Automerger [Tue, 20 Nov 2012 00:03:54 +0000 (16:03 -0800)]
JOP40D
The Android Automerger [Mon, 19 Nov 2012 23:44:50 +0000 (15:44 -0800)]
JDP47D
Ed Heyl [Mon, 19 Nov 2012 22:26:49 +0000 (14:26 -0800)]
am
efcc8b1c: bump version to 4.2.1
* commit '
efcc8b1c79011a6d8ea13774da84c8892cb27e27':
bump version to 4.2.1
Ed Heyl [Mon, 19 Nov 2012 22:20:48 +0000 (14:20 -0800)]
bump version to 4.2.1
Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
The Android Automerger [Sat, 17 Nov 2012 01:23:04 +0000 (17:23 -0800)]
JDP47C
The Android Automerger [Sat, 17 Nov 2012 01:01:05 +0000 (17:01 -0800)]
JDP47B
The Android Automerger [Fri, 16 Nov 2012 19:32:14 +0000 (11:32 -0800)]
JDP47
Scott Main [Fri, 16 Nov 2012 18:45:44 +0000 (10:45 -0800)]
am
34a4b823: Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev
* commit '
34a4b8239e25103eb796dabd046d821942706b9f':
docs: revise message when api level for docs is too low; make the message appear on package pages as well
Scott Main [Fri, 16 Nov 2012 18:43:23 +0000 (10:43 -0800)]
Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev
Scott Main [Fri, 16 Nov 2012 18:34:22 +0000 (10:34 -0800)]
docs: revise message when api level for docs is too low;
make the message appear on package pages as well
Change-Id: I9e71d4054e2e14efe9646029ac0a18022ec24fb2
Guang Zhu [Fri, 16 Nov 2012 01:47:53 +0000 (17:47 -0800)]
DO NOT MERGE: change build id to JB MR1.1
Among other things, this helps monitoring of automated tests, to
properly show which branch the device is running on
Change-Id: I8bb8e3ec347849da44d29ce502b09a593d61ae0e
Scott Main [Thu, 15 Nov 2012 23:21:00 +0000 (15:21 -0800)]
am
11ac05bb: docs: add script for 32/64-bit bundle downloads
* commit '
11ac05bb015c4097f828b0907a0835f7d546738c':
docs: add script for 32/64-bit bundle downloads
Scott Main [Thu, 15 Nov 2012 22:57:44 +0000 (14:57 -0800)]
docs: add script for 32/64-bit bundle downloads
Change-Id: I502e4ced8ac30cc19bf321e7a586f28244bf1294
Ying Wang [Thu, 15 Nov 2012 23:17:42 +0000 (15:17 -0800)]
Merge "Move check-api to definition.mk" into jb-mr1.1-dev
Scott Main [Thu, 15 Nov 2012 01:42:20 +0000 (17:42 -0800)]
am
83cd28b3: am
9efb6b09: am
be264b6d: am
5a1123ef: add script to generate list of classes for each training course landing page
* commit '
83cd28b354e222e5ca78b17229fa456e40d8c900':
add script to generate list of classes for each training course landing page
Scott Main [Thu, 15 Nov 2012 01:40:58 +0000 (17:40 -0800)]
am
9efb6b09: am
be264b6d: am
5a1123ef: add script to generate list of classes for each training course landing page
* commit '
9efb6b09c4a32cc5cd190a224d15022968859ddb':
add script to generate list of classes for each training course landing page
Scott Main [Thu, 15 Nov 2012 01:39:42 +0000 (17:39 -0800)]
am
be264b6d: am
5a1123ef: add script to generate list of classes for each training course landing page
* commit '
be264b6da6631b8c7d526fc3dc76a6ddbb881fee':
add script to generate list of classes for each training course landing page
Scott Main [Thu, 15 Nov 2012 01:38:11 +0000 (17:38 -0800)]
am
5a1123ef: add script to generate list of classes for each training course landing page
* commit '
5a1123ef7a43c007ff4cfb6c04d3f9dc5436f1c6':
add script to generate list of classes for each training course landing page
Scott Main [Wed, 26 Sep 2012 19:51:28 +0000 (12:51 -0700)]
add script to generate list of classes for each training course landing page
Change-Id: Ieac8a97a8d6fda41a3682241901150cfe16afc4d
Ying Wang [Wed, 14 Nov 2012 23:57:07 +0000 (15:57 -0800)]
Move check-api to definition.mk
1) Move check-api to definition.mk, so it can be used in other places.
2) Add additional dependency to the api-stub module to consolidate the
apicheck dependency. Previously you have to run 2 "make"s in a row and
only in the 2nd run apicheck is run, due to a gnu-make optimization.
Bug:
7540265
Change-Id: Ib24ed87d9330027a9f95ed7b16dd4002cc0e3198