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
da3e577b47
am 35fc8255: am 8b6b233a: am 07d73623: am bf323d72: Update platform tools rev to 16.0.2
...
* commit '35fc8255c0470776961cd28fceb2b0261bf8d20a':
Update platform tools rev to 16.0.2
2013-01-02 16:34:26 -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
4966cb2f15
am 86165d9c: am 8df02abd: Merge "Add binaries to bootstrap GCC build with OpenMP"
...
* commit '86165d9c6778053f6f8539df3885716b67f83846':
Add binaries to bootstrap GCC build with OpenMP
2012-12-28 09:48:51 -08:00
Andrew Hsieh
aef2b16667
am 6b00756c: am 2d52182d: Merge "Fix wint_t in android-3 and android-8 to be consistent with android-9"
...
* commit '6b00756c8cd0631820911bde1a1f5529787e262a':
Fix wint_t in android-3 and android-8 to be consistent with android-9
2012-12-28 09:48:29 -08:00
Andrew Hsieh
dedc755d5a
am 2293b51c: am 9a204c55: Merge "Remove duplicated definitions of size_t and ssize_t"
...
* commit '2293b51c64b75d3b6cdbdc4d0f5d790ef89ec55f':
Remove duplicated definitions of size_t and ssize_t
2012-12-28 09:48:05 -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
Igor Murashkin
acb6e78c3f
Merge "Camera2: Fix segfault when control fields were omitted in metadata"
2012-12-20 17:27:16 -08:00
Igor Murashkin
c379853c05
Merge "Camera2: Test: fix deadlock in isStreamInUse"
2012-12-20 17:27:03 -08:00
Igor Murashkin
c9bb8bc042
Merge "Camera2: Return -ENODEV for camera indices out of bounds"
2012-12-20 17:26:54 -08:00
Igor Murashkin
2c0ee4a222
Camera2: Fix segfault when control fields were omitted in metadata
...
Change-Id: Ia13e7985211e44b5489624ac186e519925a40f26
2012-12-20 16:56:59 -08:00
Igor Murashkin
572a086038
Camera2: Test: fix deadlock in isStreamInUse
...
Change-Id: I2ac46303e96c3ccaaa0f76555b89bbeed45a3919
2012-12-20 16:56:34 -08:00
Igor Murashkin
09167dc112
Camera2: Return -ENODEV for camera indices out of bounds
...
This allows CameraModuleTest.LoadModuleBadIndices and
CameraModuleTest.GetCameraInfoBadIndices to pass.
Change-Id: Iffc658b256642ea0684fd8ad864fd273829bb35d
2012-12-20 16:56:20 -08:00
Andrew Hsieh
d210943b50
am 26d1e005: am 852b3581: Merge "Sync pthread.h and resolv.h"
...
* commit '26d1e005e5b728f8ffac5165e1358c8379090c55':
Sync pthread.h and resolv.h
2012-12-20 11:06:55 -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
Igor Murashkin
871e2f54ab
Merge "Camera2: Turn off 3A when android.control.mode == OFF"
2012-12-18 14:25:50 -08:00
Igor Murashkin
37f8f607c1
Merge "Revert "Camera2: Fix a potential race condition in the readout thread""
2012-12-18 14:22:25 -08:00
The Android Open Source Project
103af7c17d
am a8af928f: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit 'a8af928f4e7dc3e0cd00bdaa0c168ac53fcd9bc0':
2012-12-14 16:48:45 -08:00
Igor Murashkin
6d305d0183
Camera2: Turn off 3A when android.control.mode == OFF
...
Change-Id: Ie6a8726e14529a8605b9ecae6adfa705e79df00a
2012-12-14 14:17:36 -08:00
Igor Murashkin
c4464b7fee
Revert "Camera2: Fix a potential race condition in the readout thread"
...
The last fix incorrectly added a mutex lock which did not guard the appropriate
variables.
In fact it actually *introduced* a new race condition in a HAL test.
This reverts commit 6edd7ab4a4 .
2012-12-14 14:17:36 -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
Derek Sollenberger
494524a7c9
Merge "Remove outdated FontLab app since Skia no longer uses it to tune gamma values."
2012-12-14 05:00:03 -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
dd067789b8
am 34b168f6: am 92a7f64c: am fa8f593a: am 50600ba5: am a525bf71: am 1e083591: am 2c063c88: Android Training: Threads sample app
...
* commit '34b168f642a5dd30186ce76cdc9ef71d272c22cb':
Android Training: Threads sample app
2012-12-13 11:11:56 -08:00
Dirk Dougherty
4bda5fb0c5
am 5c2bd5a4: am 298ed7d6: am 4b5dc0ce: am 01b1a873: Merge "Add ko and ru to validLangs." into jb-mr1-dev
...
* commit '5c2bd5a4a5b34542ee762e070a0c241d43c83c1a':
Add ko and ru to validLangs.
2012-12-13 11:11:54 -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