Commit graph

10453 commits

Author SHA1 Message Date
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 Open Source Project
afac6c903d Reconcile with jb-mr1-release - do not merge
Change-Id: Ib6d98680f4ca7dacc33209363896f2cdff2127ed
2012-11-29 11:54:49 -08:00
The Android Automerger
fd74ba5175 JOP40E 2012-11-29 10:45:10 -08:00
Robert Ly
b3748f317a am 40e90998: add google services tab
* commit '40e9099805da2e91ec09c3bab79a7e825fca9d91':
  add google services tab
2012-11-28 18:15:48 -08:00
Robert Ly
40e9099805 add google services tab
Change-Id: Ia5b249b825c33334458a6762be2d62b657bc0d58
2012-11-28 17:58:58 -08:00
Scott Main
7942a93679 am d4cb7831: add \'external-link\' class for links that go off-site
* commit 'd4cb783159c76d0ea9423020b3ab6ec77a21506e':
  add 'external-link' class for links that go off-site
2012-11-28 11:14:20 -08:00
Scott Main
d4cb783159 add 'external-link' class for links that go off-site
Change-Id: I9e78cd6a7cb2ce14e5e15fe43e87b55ac456f302
2012-11-28 11:10:09 -08:00
Robert Ly
50a8ce108b am 7d131e0a: fix build
* commit '7d131e0ad6695d1b46ab7854277fdbbf523f3d29':
  fix build
2012-11-27 17:33:27 -08:00
Robert Ly
7d131e0ad6 fix build
Change-Id: I3e98493aac48b0061d44351fb8c0f07a759b25c0
2012-11-27 17:27:34 -08:00
Scott Main
1aace7da06 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
2012-11-27 15:09:17 -08:00
Scott Main
502c939f6d docs: add support for an infinite number of nested lists in side nav
Change-Id: I9e0fa672e20067f3e09f56560e7d11847d0b9388
2012-11-27 15:00:40 -08:00
Ying Wang
f44a518c10 am c69b7735: Put ANDROID_BUILD_PATHS before the system default PATH
* commit 'c69b773506ecf2316059a9fe947bbeb524a402b3':
  Put ANDROID_BUILD_PATHS before the system default PATH
2012-11-27 14:17:27 -08:00
Ying Wang
c69b773506 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
2012-11-27 14:14:42 -08:00
Keun young Park
d4f8d5e649 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
2012-11-27 10:54:17 -08:00
The Android Open Source Project
257fef4308 Reconcile with jb-mr1-release - do not merge
Change-Id: Ic400b5287afc2fcb3a6205e5e57aa89af6572911
2012-11-27 07:33:15 -08:00
Ed Heyl
d4382dd07e bump version to 4.2.1
Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
2012-11-19 16:04:18 -08:00
The Android Automerger
476750c763 JOP40D 2012-11-19 16:03:54 -08:00
Ed Heyl
0ddeb0ccc1 am efcc8b1c: bump version to 4.2.1
* commit 'efcc8b1c79011a6d8ea13774da84c8892cb27e27':
  bump version to 4.2.1
2012-11-19 14:26:49 -08:00
Ed Heyl
efcc8b1c79 bump version to 4.2.1
Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
2012-11-19 14:20:48 -08:00
Scott Main
6a0402701e 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
2012-11-16 10:45:44 -08:00
Scott Main
34a4b8239e 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 2012-11-16 10:43:23 -08:00
Scott Main
8f24ca8e3b docs: revise message when api level for docs is too low;
make the message appear on package pages as well

Change-Id: I9e71d4054e2e14efe9646029ac0a18022ec24fb2
2012-11-16 10:34:22 -08:00
Guang Zhu
f0d4d8f329 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
2012-11-15 17:47:53 -08:00
Scott Main
1f0850ee04 am 11ac05bb: docs: add script for 32/64-bit bundle downloads
* commit '11ac05bb015c4097f828b0907a0835f7d546738c':
  docs: add script for 32/64-bit bundle downloads
2012-11-15 15:21:00 -08:00
Scott Main
11ac05bb01 docs: add script for 32/64-bit bundle downloads
Change-Id: I502e4ced8ac30cc19bf321e7a586f28244bf1294
2012-11-15 15:18:05 -08:00
Ying Wang
ce811261bc Merge "Move check-api to definition.mk" into jb-mr1.1-dev 2012-11-15 15:17:43 -08:00
Scott Main
2dc85a0fe0 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
2012-11-14 17:42:20 -08:00
Scott Main
83cd28b354 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
2012-11-14 17:40:58 -08:00
Scott Main
9efb6b09c4 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
2012-11-14 17:39:42 -08:00
Scott Main
be264b6da6 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
2012-11-14 17:38:11 -08:00
Scott Main
5a1123ef7a add script to generate list of classes for each training course landing page
Change-Id: Ieac8a97a8d6fda41a3682241901150cfe16afc4d
2012-11-14 17:31:07 -08:00
Ying Wang
c065da2307 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
2012-11-14 16:00:45 -08:00
Scott Main
912ed02b53 am 7c05b69c: docs: add warning message for adt when on 32-bit os
* commit '7c05b69c0c985bd2f57caec9143710a2204317b8':
  docs: add warning message for adt when on 32-bit os
2012-11-14 15:13:25 -08:00
Scott Main
7c05b69c0c docs: add warning message for adt when on 32-bit os
Change-Id: I457a219bb1f9e07d6b94084c69c56309568a4881
2012-11-14 14:12:29 -08:00
Scott Main
4e9b723f69 am 098d8dea: docs: add support for ndk tos wall
* commit '098d8deaefaf6f834db86c15999d2aedd038d272':
  docs: add support for ndk tos wall
2012-11-13 11:42:50 -08:00
Scott Main
098d8deaef docs: add support for ndk tos wall
Change-Id: Ife49429b8241f4e9ce5aaa9f6494d52014a3f238
2012-11-13 11:40:42 -08:00
Scott Main
3894b39ec3 am df0e1617: docs: css fix
* commit 'df0e161703de693dd6a837c56be810a9e29e7d3c':
  docs: css fix
2012-11-13 07:55:09 -08:00
Scott Main
6f4d588faa am e0c11a6f: docs: fix broken template
* commit 'e0c11a6f9ae9345da7109c4b08d26778e8265520':
  docs: fix broken template
2012-11-13 07:52:42 -08:00
Scott Main
df0e161703 docs: css fix
Change-Id: Ie03e7708866fd2e97347ee10f3a40b2f77b0a803
2012-11-13 07:52:20 -08:00
Scott Main
e0c11a6f9a docs: fix broken template
Change-Id: Ibb804bcf8851cdb15cf6c98dff25a3a391eb8301
2012-11-13 07:47:50 -08:00
Scott Main
f528f4307d am bbffb4bf: docs: add support for templated tabs with the doc title
* commit 'bbffb4bfb48eb0adb7dc827594f41428f8ffcc19':
  docs: add support for templated tabs with the doc title
2012-11-13 07:46:45 -08:00
Scott Main
bbffb4bfb4 docs: add support for templated tabs with the doc title
Change-Id: I820a2704d21c94a9a452854a46ea88749d8274d0
2012-11-13 07:40:16 -08:00
Scott Main
896f9ec991 am 705e8a4f: docs: something whatever
* commit '705e8a4f6100486dbcf1530490e9761c1afa1a6e':
  docs: something whatever
2012-11-13 06:22:26 -08:00
Scott Main
705e8a4f61 docs: something whatever
Change-Id: I08120f1e27a488dfec03868758ab6de2e75fdc09
2012-11-13 05:36:12 -08:00
Scott Main
deac4de56e am 55d99832: docs: changes to sdk page and script for toggles
* commit '55d99832fd2631bc9453141ae3a23e2eb074ede0':
  docs: changes to sdk page and script for toggles
2012-11-13 02:29:52 -08:00
Scott Main
55d99832fd docs: changes to sdk page and script for toggles
Change-Id: Idef0c6099885cada3a4866ed7b5ec5b6f5078e39
2012-11-12 23:03:59 -08:00
Scott Main
0a6deb1c69 am 8fa72222: am 2953f0b0: am fef18c61: am db3678bc: add ADT Bundle to the download page
* commit '8fa72222419fa0a94509e507f4450c941313590d':
  add ADT Bundle to the download page
2012-11-12 18:09:21 -08:00
Scott Main
8fa7222241 am 2953f0b0: am fef18c61: am db3678bc: add ADT Bundle to the download page
* commit '2953f0b0b1fcd350ff269b611a2b43fa62773943':
  add ADT Bundle to the download page
2012-11-12 18:07:58 -08:00
Scott Main
2953f0b0b1 am fef18c61: am db3678bc: add ADT Bundle to the download page
* commit 'fef18c61f5146d1a2eb7ed1f48bf5aaa2af08923':
  add ADT Bundle to the download page
2012-11-12 18:06:25 -08:00
Scott Main
fef18c61f5 am db3678bc: add ADT Bundle to the download page
* commit 'db3678bcaadf74b1a940a3dafb9fda4e238250be':
  add ADT Bundle to the download page
2012-11-12 18:05:00 -08:00