Commit Graph

12088 Commits

Author SHA1 Message Date
Geremy Condra
0303484707 Fixed runtest to work with python != 2.4
Change-Id: I6104adb5a6549eb4eaa3f2096633a49e4743ce50
2012-10-19 15:08:05 -07:00
The Android Automerger
cc8defb1b1 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-19 06:59:22 -07:00
Xavier Ducrohet
8660c2f280 am 40ba6ec8: (-s ours) am 8be1a88d: am 43b41f52: am bb65013d: (-s ours) am fc848872: Update platform source.prop for new layoutlib. do not merge.
* commit '40ba6ec8187186bf4586e94ea05b7574e2b27c45':
  Update platform source.prop for new layoutlib. do not merge.
2012-10-18 18:01:24 -07:00
Xavier Ducrohet
40ba6ec818 am 8be1a88d: am 43b41f52: am bb65013d: (-s ours) am fc848872: Update platform source.prop for new layoutlib. do not merge.
* commit '8be1a88d20f9d9980075f67396781cb59660a36a':
  Update platform source.prop for new layoutlib. do not merge.
2012-10-18 17:59:12 -07:00
Xavier Ducrohet
8be1a88d20 am 43b41f52: am bb65013d: (-s ours) am fc848872: Update platform source.prop for new layoutlib. do not merge.
* commit '43b41f5298658a5e95410df5ed80f7dea816abd2':
  Update platform source.prop for new layoutlib. do not merge.
2012-10-18 17:56:13 -07:00
Xavier Ducrohet
43b41f5298 am bb65013d: (-s ours) am fc848872: Update platform source.prop for new layoutlib. do not merge.
* commit 'bb65013d27d222ef63258a574665cd197c985580':
  Update platform source.prop for new layoutlib. do not merge.
2012-10-18 17:53:58 -07:00
Xavier Ducrohet
bb65013d27 am fc848872: Update platform source.prop for new layoutlib. do not merge.
* commit 'fc8488729db76770c29bf9a66805fab421bf000c':
  Update platform source.prop for new layoutlib. do not merge.
2012-10-18 17:50:36 -07:00
Xavier Ducrohet
fc8488729d Update platform source.prop for new layoutlib. do not merge.
Change-Id: Idd813cc0c69d67e1f60e23ec0b4254d26e459ba3
2012-10-18 17:40:20 -07:00
Jeff Hamilton
8318f4d453 am c5d3d8fe: am 4e9866a7: am 30870013: Merge "Change the name of the location config value." into jb-mr1-dev
* commit 'c5d3d8fe47219a17a50865de71f5ce03d03fddbd':
  Change the name of the location config value.
2012-10-18 12:46:20 -07:00
Jeff Hamilton
c5d3d8fe47 am 4e9866a7: am 30870013: Merge "Change the name of the location config value." into jb-mr1-dev
* commit '4e9866a74b19819a7deb78c22ed8814cf8ae8456':
  Change the name of the location config value.
2012-10-18 12:44:28 -07:00
Jeff Hamilton
4e9866a74b am 30870013: Merge "Change the name of the location config value." into jb-mr1-dev
* commit '30870013927905645c1afb08a336df2c3e4e7d47':
  Change the name of the location config value.
2012-10-18 12:41:23 -07:00
Jeff Hamilton
3087001392 Merge "Change the name of the location config value." into jb-mr1-dev 2012-10-18 12:39:24 -07:00
The Android Automerger
56311b5943 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-18 06:59:22 -07:00
Xavier Ducrohet
9388e93e63 am 7c11b0ce: am 9be07e8c: am 06c5d2f2: Merge "update source.prop for the sdk platform package." into jb-mr1-dev
* commit '7c11b0ce73117331ed9dcbfdd8c3b79d3841c59a':
  update source.prop for the sdk platform package.
2012-10-17 17:28:16 -07:00
Xavier Ducrohet
7c11b0ce73 am 9be07e8c: am 06c5d2f2: Merge "update source.prop for the sdk platform package." into jb-mr1-dev
* commit '9be07e8c914438a4918a272fc8944141964c8d62':
  update source.prop for the sdk platform package.
2012-10-17 17:25:35 -07:00
Xavier Ducrohet
9be07e8c91 am 06c5d2f2: Merge "update source.prop for the sdk platform package." into jb-mr1-dev
* commit '06c5d2f21f1c8ff049c21414a638fa85e080e8e8':
  update source.prop for the sdk platform package.
2012-10-17 17:23:15 -07:00
Xavier Ducrohet
06c5d2f21f Merge "update source.prop for the sdk platform package." into jb-mr1-dev 2012-10-17 17:21:43 -07:00
Xavier Ducrohet
ab136ad100 update source.prop for the sdk platform package.
Uses the new Layoutlib API 9
Requires tools 21.

Change-Id: If1ced35107df4118775d95e3c44ebfd94a0f1209
2012-10-17 17:20:47 -07:00
The Android Automerger
4cce2a32b0 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-17 16:07:00 -07:00
Scott Main
8d372c4d1d am 580e902e: am d6d8114b: am 1cb485c8: am b63a8975: am 37e24aec: am 352b33ba: add redirect for layout-objects.html bug: 7366567
* commit '580e902e97cf2b94f182d8352a542ae6b4748938':
  add redirect for layout-objects.html bug: 7366567
2012-10-17 15:50:32 -07:00
Scott Main
580e902e97 am d6d8114b: am 1cb485c8: am b63a8975: am 37e24aec: am 352b33ba: add redirect for layout-objects.html bug: 7366567
* commit 'd6d8114ba55ead1756cf13e9f154a52688bb959a':
  add redirect for layout-objects.html bug: 7366567
2012-10-17 15:48:38 -07:00
Scott Main
d6d8114ba5 am 1cb485c8: am b63a8975: am 37e24aec: am 352b33ba: add redirect for layout-objects.html bug: 7366567
* commit '1cb485c8b61c05b8885e1566952f6fcfabab412d':
  add redirect for layout-objects.html bug: 7366567
2012-10-17 15:46:15 -07:00
Scott Main
1cb485c8b6 am b63a8975: am 37e24aec: am 352b33ba: add redirect for layout-objects.html bug: 7366567
* commit 'b63a8975abad7381491aad0d85b107a9cb58ec56':
  add redirect for layout-objects.html bug: 7366567
2012-10-17 15:44:15 -07:00
Scott Main
b63a8975ab am 37e24aec: am 352b33ba: add redirect for layout-objects.html bug: 7366567
* commit '37e24aecdee0193648a2d62d594aed8cd137bf89':
  add redirect for layout-objects.html bug: 7366567
2012-10-17 15:41:21 -07:00
Scott Main
37e24aecde am 352b33ba: add redirect for layout-objects.html bug: 7366567
* commit '352b33ba8bf0b590d7db8fb694ad0360265627eb':
  add redirect for layout-objects.html bug: 7366567
2012-10-17 15:37:42 -07:00
Scott Main
352b33ba8b add redirect for layout-objects.html
bug: 7366567

Change-Id: Ie660fd1353fc7106da1afa5df2951a3e5d9d8477
2012-10-17 11:25:09 -07:00
The Android Automerger
480774f2eb merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-16 17:30:13 -07:00
Jeff Hamilton
13dc6a2223 Change the name of the location config value.
This reverts commit 329b760e8e.

Bug: 7242814
2012-10-16 16:14:25 -05:00
Scott Main
8e1aea4acd am 5e75d408: am 7e78827e: am b0cab80d: am 487869a8: am 05bca821: am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
* commit '5e75d4083082be8be125f9fecefc5cc6ba132c0b':
  add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
2012-10-16 11:51:10 -07:00
Scott Main
5e75d40830 am 7e78827e: am b0cab80d: am 487869a8: am 05bca821: am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
* commit '7e78827e935d0dadd93d53f78835a7b6fe141918':
  add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
2012-10-16 11:49:02 -07:00
Scott Main
7e78827e93 am b0cab80d: am 487869a8: am 05bca821: am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
* commit 'b0cab80d117ff842767d9bb95ff56d0b8d002d9a':
  add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
2012-10-16 11:46:14 -07:00
Scott Main
b0cab80d11 am 487869a8: am 05bca821: am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
* commit '487869a86bae6246b51cee91bc4ceb543d23b317':
  add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
2012-10-16 11:43:56 -07:00
Scott Main
487869a86b am 05bca821: am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
* commit '05bca821e1c401bbd9dacb200aa0e6a2759c3478':
  add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
2012-10-16 11:41:19 -07:00
Scott Main
05bca821e1 am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
* commit 'ec54ca1518080e12ee042e596f2e1947917293ea':
  add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
2012-10-16 11:39:04 -07:00
Andrew Hsieh
5ab815eaca am d52033ca: am 1d35fba9: Merge "ndk: Remove LONG_LONG_MIN/MAX hack from pthread.h"
* commit 'd52033cafc7333df99e9c283d3f002cd1d1a2300':
  ndk: Remove LONG_LONG_MIN/MAX hack from pthread.h
2012-10-16 10:33:57 -07:00
Andrew Hsieh
d52033cafc am 1d35fba9: Merge "ndk: Remove LONG_LONG_MIN/MAX hack from pthread.h"
* commit '1d35fba9bd37d4d6af224bbd25a034a680bca2eb':
  ndk: Remove LONG_LONG_MIN/MAX hack from pthread.h
2012-10-16 10:30:47 -07:00
Andrew Hsieh
1d35fba9bd Merge "ndk: Remove LONG_LONG_MIN/MAX hack from pthread.h" 2012-10-16 10:12:26 -07:00
David 'Digit' Turner
db5a5ada90 ndk: Remove LONG_LONG_MIN/MAX hack from pthread.h
The LONG_LONG_MIN, LONG_LONG_MAX and ULONG_LONG_MAX are
GLibc-specific macros. Move their declarations from
<pthread.h> to <limits.h> where they belong.

Change-Id: I597465b99893706ade82069238f60df73d8e236e
2012-10-16 09:49:10 +02:00
Andrew Hsieh
15e607de98 am c7ceaa79: am 9f17b1e1: Merge "Remove obsolete LOCAL_NDK_VERSION"
* commit 'c7ceaa791d6388ff9cf64740e3afc92c50b7ec03':
  Remove obsolete LOCAL_NDK_VERSION
2012-10-15 20:25:58 -07:00
Andrew Hsieh
c7ceaa791d am 9f17b1e1: Merge "Remove obsolete LOCAL_NDK_VERSION"
* commit '9f17b1e1a40076470c9e521b298ba29e771419dc':
  Remove obsolete LOCAL_NDK_VERSION
2012-10-15 20:20:58 -07:00
Andrew Hsieh
9f17b1e1a4 Merge "Remove obsolete LOCAL_NDK_VERSION" 2012-10-15 20:05:15 -07:00
The Android Open Source Project
dca488897f am d32a7310: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit 'd32a73105b23fecf3c9b6dcb2321713909bd85fd':
2012-10-15 07:40:18 -07:00
The Android Open Source Project
d32a73105b Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: If89cb33a85e3457bff663b54d6dc16b05f180294
2012-10-15 07:38:06 -07:00
Andrew Hsieh
ed7dac09d8 Remove obsolete LOCAL_NDK_VERSION
Other than it's obsolete, it's outdated to use r4 (rather than the
most recently one)

Change-Id: I0a0dca663056a071a714d49a5d5bb77bd379c18a
2012-10-15 13:06:26 +08:00
The Android Automerger
617f824298 merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-12 16:34:28 -07:00
Scott Main
ec54ca1518 add redirect from nofification summary page to Notifications doc
because this navigation is now flat so each doc is visible in side nav at top

Change-Id: I64e8788a8d7bb7992c410cec0c494b8157d4d651
2012-10-12 12:15:09 -07:00
The Android Automerger
018dba6896 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-12 11:49:50 -07:00
Laurent Tu
71bf084189 am f7e5b78d: am 72452858: am 91d9d51f: Return accuracy in GPS emulation
* commit 'f7e5b78d88577fb7a0e6189a2190eb24dc69b8ea':
  Return accuracy in GPS emulation
2012-10-12 11:14:16 -07:00
Laurent Tu
f7e5b78d88 am 72452858: am 91d9d51f: Return accuracy in GPS emulation
* commit '72452858484192b07e550ae42f9068e3767cf68d':
  Return accuracy in GPS emulation
2012-10-12 11:10:10 -07:00
The Android Automerger
41359ffcda merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-12 10:26:27 -07:00