Commit Graph

11380 Commits

Author SHA1 Message Date
Katie McCormick
1f1524395d am 65cc8b78: Network sample: fix typo in manifest
* commit '65cc8b78a8a3594911772c665d77fd6030d9fd51':
  Network sample: fix typo in manifest
2013-01-04 16:35:53 -08:00
Katie McCormick
65cc8b78a8 Network sample: fix typo in manifest
Change-Id: I5731dbb89d17bd15bc72a2f140bca2915976b4c1
2013-01-04 16:04:23 -08:00
Andrew Hsieh
843f237ba0 am d3bce3f1: am 8e84a15f: Merge "Sync sys/limits.h and sys/sysconf.h"
* commit 'd3bce3f109277c2770af2f59bd41b0b1db9e91b7':
  Sync sys/limits.h and sys/sysconf.h
2013-01-03 10:58:53 -08:00
Andrew Hsieh
dc7edc872b am 0c262558: am 6d2a832f: Merge "Sync fenv.h"
* commit '0c2625587b262d8dbc338f85b2ee882779e28370':
  Sync fenv.h
2013-01-03 10:58:51 -08:00
Andrew Hsieh
d3bce3f109 am 8e84a15f: Merge "Sync sys/limits.h and sys/sysconf.h"
* commit '8e84a15fedf5bc0627f7ccea227a88d1cad90252':
  Sync sys/limits.h and sys/sysconf.h
2013-01-03 10:55:45 -08:00
Andrew Hsieh
0c2625587b am 6d2a832f: Merge "Sync fenv.h"
* commit '6d2a832fec161297d5d96ae1f9868b2bce83b2ca':
  Sync fenv.h
2013-01-03 10:55:44 -08:00
Andrew Hsieh
8e84a15fed Merge "Sync sys/limits.h and sys/sysconf.h" 2013-01-03 10:34:13 -08:00
Andrew Hsieh
6d2a832fec Merge "Sync fenv.h" 2013-01-03 10:33:50 -08:00
Andrew Hsieh
75d889ea23 Sync sys/limits.h and sys/sysconf.h
See http://code.google.com/p/android/issues/detail?id=39680
and a55f63083fb16b2595f517a3260083e5f8cddd02

Change-Id: I2d1548814eb771c26b540f5fee57dabf54fcfdd6
2013-01-03 12:28:48 +08:00
Andrew Hsieh
d693e84421 Sync fenv.h
See See 0f7809d5c364565e210554ca2b5d8eedf8a57ec7
90e10d41c4271a5d517f60f4ff1d2891b8ccc034

Change-Id: Id59b6c24f74f03f7d4b0c420fdb59fb2ab98be0d
2013-01-03 12:12:39 +08:00
Xavier Ducrohet
35fc8255c0 am 8b6b233a: am 07d73623: am bf323d72: Update platform tools rev to 16.0.2
* commit '8b6b233a8b11bd3182f2971a957206c60da036b6':
  Update platform tools rev to 16.0.2
2013-01-02 13:06:16 -08:00
Xavier Ducrohet
8b6b233a8b am 07d73623: am bf323d72: Update platform tools rev to 16.0.2
* commit '07d7362394270401227575a7c00a555b7f9e6147':
  Update platform tools rev to 16.0.2
2013-01-02 13:03:23 -08:00
Xavier Ducrohet
07d7362394 am bf323d72: Update platform tools rev to 16.0.2
* commit 'bf323d72b7db944a4a0c8794f28e03367abd8c99':
  Update platform tools rev to 16.0.2
2013-01-02 13:00:56 -08:00
Xavier Ducrohet
bf323d72b7 Update platform tools rev to 16.0.2
Change-Id: I814294bc9374f6194671eb173bd9942908db3848
2013-01-02 12:28:36 -08:00
Andrew Hsieh
86165d9c67 am 8df02abd: Merge "Add binaries to bootstrap GCC build with OpenMP"
* commit '8df02abd897f1cd3eafae907cce64c9091a6f27e':
  Add binaries to bootstrap GCC build with OpenMP
2012-12-27 05:24:37 -08:00
Andrew Hsieh
8df02abd89 Merge "Add binaries to bootstrap GCC build with OpenMP" 2012-12-27 04:03:06 -08:00
Andrew Hsieh
54e2794aba Add binaries to bootstrap GCC build with OpenMP
With --enable-libgomp, gcc/gcc-4.4.3/libiberty/configure line #2124 tries
to link a trivial program but fails w/o the presence of libc.so and libdl.so
and sets "gcc_no_link=yes" at line #2131.  Confiugre later fails with
cryptic message reads "Link tests are not allowed after GCC_NO_EXECUTABLES."

See
  https://android-review.googlesource.com/#/c/34491, 48617, and 48619

Change-Id: I6e761c5fb12f413dca04a26b39f27e9f026d75d3
2012-12-26 15:11:56 +08:00
Andrew Hsieh
6b00756c8c am 2d52182d: Merge "Fix wint_t in android-3 and android-8 to be consistent with android-9"
* commit '2d52182dfac91014c2975a1bb1afd99a3b14b4e9':
  Fix wint_t in android-3 and android-8 to be consistent with android-9
2012-12-23 22:54:16 -08:00
Andrew Hsieh
2d52182dfa Merge "Fix wint_t in android-3 and android-8 to be consistent with android-9" 2012-12-23 22:42:57 -08:00
Andrew Hsieh
7c9e2c6851 Fix wint_t in android-3 and android-8 to be consistent with android-9
Change-Id: Ia36557bfc6d1155ba8106c26bb3fd3c226ad779e
2012-12-24 14:14:55 +08:00
Andrew Hsieh
2293b51c64 am 9a204c55: Merge "Remove duplicated definitions of size_t and ssize_t"
* commit '9a204c557fd0ba86e666b6d47c2b29b7894d76ba':
  Remove duplicated definitions of size_t and ssize_t
2012-12-21 16:13:24 -08:00
Andrew Hsieh
9a204c557f Merge "Remove duplicated definitions of size_t and ssize_t" 2012-12-21 15:48:35 -08:00
Andrew Hsieh
7980acf254 Remove duplicated definitions of size_t and ssize_t
See 3975cec694a0c9b42e3f7e671fcd678da92836c3

Change-Id: Ia40ff8de3ffe923fb983bb116b740942724c641a
2012-12-21 22:29:26 +08:00
Andrew Hsieh
26d1e005e5 am 852b3581: Merge "Sync pthread.h and resolv.h"
* commit '852b358185a910bb3bdc9cec1ef3752c9bb4c522':
  Sync pthread.h and resolv.h
2012-12-20 11:04:06 -08:00
Andrew Hsieh
852b358185 Merge "Sync pthread.h and resolv.h" 2012-12-20 10:38:07 -08:00
Andrew Hsieh
9ca4e48605 Sync pthread.h and resolv.h
See 9831ad3ce6bd5b22da16a275ed67e7236eae3d1f and
23d3e6b21b4b6debff87da8c6558495e564cc38e

Change-Id: I22c7bbda1cd763e5f67410cc2e4054292e71af04
2012-12-20 19:08:54 +08:00
The Android Open Source Project
a8af928f4e Reconcile with jb-mr1.1-release - do not merge
Change-Id: I189f31812ca5c5a5a6fc95ed35bf38664c6afb6a
2012-12-14 14:03:15 -08:00
The Android Automerger
35f8b6a16c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-13 15:30:39 -08:00
Joe Malin
34b168f642 am 92a7f64c: am fa8f593a: am 50600ba5: am a525bf71: am 1e083591: am 2c063c88: Android Training: Threads sample app
* commit '92a7f64c12fb7a186ed554d4b3c09214bbcc390a':
  Android Training: Threads sample app
2012-12-13 11:07:06 -08:00
Joe Malin
92a7f64c12 am fa8f593a: am 50600ba5: am a525bf71: am 1e083591: am 2c063c88: Android Training: Threads sample app
* commit 'fa8f593a2adb12c7837972085cc63e8e0b12ebc6':
  Android Training: Threads sample app
2012-12-13 11:04:56 -08:00
Joe Malin
fa8f593a2a am 50600ba5: am a525bf71: am 1e083591: am 2c063c88: Android Training: Threads sample app
* commit '50600ba5d68e1e002bd8b6ca646be93f922d37ab':
  Android Training: Threads sample app
2012-12-13 11:03:10 -08:00
Joe Malin
50600ba5d6 am a525bf71: am 1e083591: am 2c063c88: Android Training: Threads sample app
* commit 'a525bf719545fc315d03c1c6ee74f61e8dda03e0':
  Android Training: Threads sample app
2012-12-13 11:00:59 -08:00
Joe Malin
a525bf7195 am 1e083591: am 2c063c88: Android Training: Threads sample app
* commit '1e083591aed6b77408f6fce363bd48e63db92ed4':
  Android Training: Threads sample app
2012-12-13 10:58:59 -08:00
Joe Malin
1e083591ae am 2c063c88: Android Training: Threads sample app
* commit '2c063c889aa816e0de91bf17fdc0c78f48d5e2d0':
  Android Training: Threads sample app
2012-12-13 10:57:14 -08:00
Dirk Dougherty
5c2bd5a4a5 am 298ed7d6: am 4b5dc0ce: am 01b1a873: Merge "Add ko and ru to validLangs." into jb-mr1-dev
* commit '298ed7d64025dd44eac5b318f414d4dc23e6f015':
  Add ko and ru to validLangs.
2012-12-13 10:55:20 -08:00
Dirk Dougherty
298ed7d640 am 4b5dc0ce: am 01b1a873: Merge "Add ko and ru to validLangs." into jb-mr1-dev
* commit '4b5dc0ce4dc52d1e3ccf9e8d09dd0af6568096dd':
  Add ko and ru to validLangs.
2012-12-13 10:54:15 -08:00
Dirk Dougherty
4b5dc0ce4d am 01b1a873: Merge "Add ko and ru to validLangs." into jb-mr1-dev
* commit '01b1a8739b338f50393e7c113d3a168710b45679':
  Add ko and ru to validLangs.
2012-12-13 10:52:28 -08:00
Dirk Dougherty
01b1a8739b Merge "Add ko and ru to validLangs." into jb-mr1-dev 2012-12-13 10:34:26 -08:00
Dirk Dougherty
22c9415195 Add ko and ru to validLangs.
Change-Id: I40d1a8e82d4b30cc2e787826252a85161e0157d8
2012-12-13 10:00:30 -08:00
Andrew Hsieh
4c5a8a606d am e4b3c7a3: Merge "Correct typo"
* commit 'e4b3c7a31d9647b468384668d2cee88295464a71':
  Correct typo
2012-12-12 15:22:41 -08:00
Andrew Hsieh
e4b3c7a31d Merge "Correct typo" 2012-12-12 15:02:04 -08:00
Joe Malin
2c063c889a Android Training: Threads sample app
Change-Id: I6d07871acad31807eb4bf06aa8406b722320680c
2012-12-12 10:47:58 -08:00
Andrew Hsieh
e9401bf645 am 4bddb6f5: Merge "Fix <endian.h> and <sys/endian.h>"
* commit '4bddb6f5f7f1b00f2263b059156dfc07efea920b':
  Fix <endian.h> and <sys/endian.h>
2012-12-12 06:05:12 -08:00
Andrew Hsieh
4bddb6f5f7 Merge "Fix <endian.h> and <sys/endian.h>" 2012-12-12 05:38:32 -08:00
Andrew Hsieh
d30385fc7c Correct typo
Change-Id: I150ee24f93d1a4fe16de938dafb335a9f1a171b0
2012-12-12 10:34:21 +08:00
Andrew Hsieh
ab13dd0e7a Fix <endian.h> and <sys/endian.h>
See 4fa35d8ae80c175425e9525831d7b6a71a3ada60

Change-Id: Ia14386f2e762fd7c0a1fc8f3e7cf8c0ce05b1dd5
2012-12-12 10:04:53 +08:00
The Android Open Source Project
7c1c45e449 Reconcile with jb-mr1.1-release - do not merge
Change-Id: I15433e982bbaa80391db117f5f1abd40469c70a6
2012-12-10 15:19:19 -08:00
Raphael Moll
bae4324402 am d8aa2895: Merge "SDK: fix sdk_repo build."
* commit 'd8aa2895f40018b13b1443144b5355d4b84f8acf':
  SDK: fix sdk_repo build.
2012-12-10 13:36:41 -08:00
Raphael Moll
d8aa2895f4 Merge "SDK: fix sdk_repo build." 2012-12-10 13:17:16 -08:00
Raphael Moll
437419089c SDK: fix sdk_repo build.
The makefile for sdk_repo looks for the repository/addon XSD files in the tree,
these paths needed to be adjusted due to the recent reorganization.

Change-Id: I50120542f78dc72da51b4d5377214c064ec68c01
2012-12-10 13:06:52 -08:00