Andrew Hsieh
af1632e1c1
am 407c3481: am 121d1955: am 82043724: am 9cf4d01b: am 51f72cc1: Merge "Support asm/sockios.h for MIPS."
...
* commit '407c3481531422091d845f0b344c14f973f9ddb8':
Support asm/sockios.h for MIPS.
2012-08-23 15:58:09 -07:00
Andrew Hsieh
407c348153
am 121d1955: am 82043724: am 9cf4d01b: am 51f72cc1: Merge "Support asm/sockios.h for MIPS."
...
* commit '121d1955f72918b2ad0b70f2e437252c268381fd':
Support asm/sockios.h for MIPS.
2012-08-23 15:55:25 -07:00
Andrew Hsieh
121d1955f7
am 82043724: am 9cf4d01b: am 51f72cc1: Merge "Support asm/sockios.h for MIPS."
...
* commit '82043724c4fea5bf063e6ed5b341816b3543b955':
Support asm/sockios.h for MIPS.
2012-08-23 15:53:56 -07:00
Roman Nurik
6c52c5e306
am b2ac2d80: am a5e5a459: am e7df2e3f: am f6457d05: Merge "Retroactively add EffectiveNavigation and TabCompat sample code." into jb-dev
...
* commit 'b2ac2d803b709da4cb5925316d955dc4049a807b':
Retroactively add EffectiveNavigation and TabCompat sample code.
2012-08-23 14:16:23 -07:00
Roman Nurik
b2ac2d803b
am a5e5a459: am e7df2e3f: am f6457d05: Merge "Retroactively add EffectiveNavigation and TabCompat sample code." into jb-dev
...
* commit 'a5e5a459c06c4897dc61a508ba63e3ba239c7c3b':
Retroactively add EffectiveNavigation and TabCompat sample code.
2012-08-23 14:14:10 -07:00
Roman Nurik
a5e5a459c0
am e7df2e3f: am f6457d05: Merge "Retroactively add EffectiveNavigation and TabCompat sample code." into jb-dev
...
* commit 'e7df2e3f6eb1f847cc362f70b062fc76e7825d30':
Retroactively add EffectiveNavigation and TabCompat sample code.
2012-08-23 14:11:40 -07:00
Andy Stadler
5b8733fab8
am 3e2e762f: am a770685d: Quick fixes for .classpath (eclipse happiness)
...
* commit '3e2e762f64de21586955af4327500b9ca673b454':
Quick fixes for .classpath (eclipse happiness)
2012-08-23 12:02:50 -07:00
Andy Stadler
3e2e762f64
am a770685d: Quick fixes for .classpath (eclipse happiness)
...
* commit 'a770685d55a6709a1c73f5937aeeed6227dae7df':
Quick fixes for .classpath (eclipse happiness)
2012-08-23 12:00:58 -07:00
Andy Stadler
a770685d55
Quick fixes for .classpath (eclipse happiness)
...
Change-Id: Ibbef12b7b253bf07abdfcb1dc0ae141baf7a9315
2012-08-23 11:29:03 -07:00
Andrew Hsieh
82043724c4
am 9cf4d01b: am 51f72cc1: Merge "Support asm/sockios.h for MIPS."
...
* commit '9cf4d01b7c46401ba632db2efa471bb262bc30aa':
Support asm/sockios.h for MIPS.
2012-08-22 16:52:58 -07:00
Andrew Hsieh
9cf4d01b7c
am 51f72cc1: Merge "Support asm/sockios.h for MIPS."
...
* commit '51f72cc1bdd6f2624d5d625716ca3767cd3c3a63':
Support asm/sockios.h for MIPS.
2012-08-22 16:51:01 -07:00
Andrew Hsieh
51f72cc1bd
Merge "Support asm/sockios.h for MIPS."
2012-08-22 16:38:02 -07:00
Roman Nurik
e7df2e3f6e
am f6457d05: Merge "Retroactively add EffectiveNavigation and TabCompat sample code." into jb-dev
...
* commit 'f6457d0548f499f77c996d13cc43115e448aa437':
Retroactively add EffectiveNavigation and TabCompat sample code.
2012-08-22 16:21:36 -07:00
The Android Open Source Project
900372d120
am 5c947e5b: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '5c947e5b3225736666bef19d7dba4f2371d7e580':
2012-08-22 15:37:16 -07:00
The Android Open Source Project
5c947e5b32
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I33319cd5922c68dc837e732a183041520a4ea634
2012-08-22 15:34:49 -07:00
Chao-Ying Fu
4cad8d6fdf
Support asm/sockios.h for MIPS.
...
Change-Id: I5ae75b0a8c2ff5698ca46f02bb371e710fb1fee0
2012-08-22 13:37:26 -07:00
Roman Nurik
f6457d0548
Merge "Retroactively add EffectiveNavigation and TabCompat sample code." into jb-dev
2012-08-22 11:50:43 -07:00
Roman Nurik
d80ee02011
Retroactively add EffectiveNavigation and TabCompat sample code.
...
This sample code was launched with the Implementing Effective Navigation and
Creating Backward-Compatible UIs training classes, but the source was never
added to AOSP. This retroactively adds the source, unmodified.
Change-Id: If6face5a0548107f7fd273e466b1ced2790f4f3a
2012-08-22 08:05:28 -07:00
The Android Automerger
4d58d5697d
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-22 06:33:24 -07:00
Andrew Hsieh
4804c51237
am a99b68e2: am 42c4770b: am c80c3a8f: am 17f2af7e: am a2b32b34: Merge "Update malloc.h"
...
* commit 'a99b68e2d78c28a387a51a0d18ee8f936340e1bf':
Update malloc.h
2012-08-22 01:26:04 -07:00
Andrew Hsieh
a99b68e2d7
am 42c4770b: am c80c3a8f: am 17f2af7e: am a2b32b34: Merge "Update malloc.h"
...
* commit '42c4770bc8d28927e969ec627027645582d4fa06':
Update malloc.h
2012-08-22 01:24:21 -07:00
Andrew Hsieh
42c4770bc8
am c80c3a8f: am 17f2af7e: am a2b32b34: Merge "Update malloc.h"
...
* commit 'c80c3a8fd8bbbe4e131d6eda7bb5d9083512a743':
Update malloc.h
2012-08-22 01:22:40 -07:00
Andrew Hsieh
c80c3a8fd8
am 17f2af7e: am a2b32b34: Merge "Update malloc.h"
...
* commit '17f2af7e1f08440814ade84898f6506e15fea15c':
Update malloc.h
2012-08-22 01:21:14 -07:00
Andrew Hsieh
17f2af7e1f
am a2b32b34: Merge "Update malloc.h"
...
* commit 'a2b32b34220a1bdea566502da1e3254c90f62f16':
Update malloc.h
2012-08-22 01:19:57 -07:00
Andrew Hsieh
a2b32b3422
Merge "Update malloc.h"
2012-08-22 01:08:42 -07:00
Andrew Hsieh
8234894831
am b155bac3: am 9f93e880: am 68d8ac7c: am ad00822f: am 581a749f: Merge "Support getrlimit and setrlimit for MIPS."
...
* commit 'b155bac32b8b4fb9f6f7aed76d0168fbfa931789':
Support getrlimit and setrlimit for MIPS.
2012-08-21 20:02:26 -07:00
Andrew Hsieh
054bf141e5
am e2a50f3a: am 1aacb8db: am 9f4549c7: am bfb39384: am 143949da: Merge "Add a .note.android.ident section to Android ELF binaries"
...
* commit 'e2a50f3ae8a244273aa81945ffddd40b83ea7297':
Add a .note.android.ident section to Android ELF binaries
2012-08-21 20:02:25 -07:00
Andrew Hsieh
b155bac32b
am 9f93e880: am 68d8ac7c: am ad00822f: am 581a749f: Merge "Support getrlimit and setrlimit for MIPS."
...
* commit '9f93e880aa60564e71da7f5c12a9cbc6df355334':
Support getrlimit and setrlimit for MIPS.
2012-08-21 20:00:34 -07:00
Andrew Hsieh
e2a50f3ae8
am 1aacb8db: am 9f4549c7: am bfb39384: am 143949da: Merge "Add a .note.android.ident section to Android ELF binaries"
...
* commit '1aacb8dbbbf1c4d205963efc4b6429ad6367ce59':
Add a .note.android.ident section to Android ELF binaries
2012-08-21 20:00:33 -07:00
Andrew Hsieh
9f93e880aa
am 68d8ac7c: am ad00822f: am 581a749f: Merge "Support getrlimit and setrlimit for MIPS."
...
* commit '68d8ac7ce5b14fe589f3c555eea2bbdc7016d8e0':
Support getrlimit and setrlimit for MIPS.
2012-08-21 19:59:40 -07:00
Andrew Hsieh
1aacb8dbbb
am 9f4549c7: am bfb39384: am 143949da: Merge "Add a .note.android.ident section to Android ELF binaries"
...
* commit '9f4549c7db3e2f08bf7a166d4eda2e935ebbf21b':
Add a .note.android.ident section to Android ELF binaries
2012-08-21 19:59:38 -07:00
Andrew Hsieh
68d8ac7ce5
am ad00822f: am 581a749f: Merge "Support getrlimit and setrlimit for MIPS."
...
* commit 'ad00822fd4b907da9162c9c1497bebc534c95315':
Support getrlimit and setrlimit for MIPS.
2012-08-21 19:57:15 -07:00
Andrew Hsieh
9f4549c7db
am bfb39384: am 143949da: Merge "Add a .note.android.ident section to Android ELF binaries"
...
* commit 'bfb393846b99f4c5f7f3c5a661b64985cda39c78':
Add a .note.android.ident section to Android ELF binaries
2012-08-21 19:57:14 -07:00
Andrew Hsieh
ad00822fd4
am 581a749f: Merge "Support getrlimit and setrlimit for MIPS."
...
* commit '581a749fb1c313dcc3d80303bcc9e129e89fdec1':
Support getrlimit and setrlimit for MIPS.
2012-08-21 19:55:57 -07:00
Andrew Hsieh
bfb393846b
am 143949da: Merge "Add a .note.android.ident section to Android ELF binaries"
...
* commit '143949daba4c1f040753a9456a5e8d7e505e5045':
Add a .note.android.ident section to Android ELF binaries
2012-08-21 19:55:56 -07:00
Andrew Hsieh
581a749fb1
Merge "Support getrlimit and setrlimit for MIPS."
2012-08-21 19:48:50 -07:00
Andrew Hsieh
143949daba
Merge "Add a .note.android.ident section to Android ELF binaries"
2012-08-21 19:48:16 -07:00
Andrew Hsieh
e930ae8832
am 471fdb7d: am da34e72a: am d8326f3e: am 6395d994: am d27250b2: Merge "Support poll for MIPS."
...
* commit '471fdb7d70b712699762adf66b8789dc4777b2cd':
Support poll for MIPS.
2012-08-21 17:35:57 -07:00
Andrew Hsieh
471fdb7d70
am da34e72a: am d8326f3e: am 6395d994: am d27250b2: Merge "Support poll for MIPS."
...
* commit 'da34e72a5d5b4df1487a13df7524969f34a637e4':
Support poll for MIPS.
2012-08-21 17:34:23 -07:00
Andrew Hsieh
da34e72a5d
am d8326f3e: am 6395d994: am d27250b2: Merge "Support poll for MIPS."
...
* commit 'd8326f3e342db6d4f345d9ea545ff885e73b82ba':
Support poll for MIPS.
2012-08-21 17:33:33 -07:00
Andrew Hsieh
d8326f3e34
am 6395d994: am d27250b2: Merge "Support poll for MIPS."
...
* commit '6395d9941e681ea4b1ebdd5a1d099ca6177c51bd':
Support poll for MIPS.
2012-08-21 17:31:46 -07:00
Andrew Hsieh
6395d9941e
am d27250b2: Merge "Support poll for MIPS."
...
* commit 'd27250b2635ad3d115983f7308cfd87ee2c3a056':
Support poll for MIPS.
2012-08-21 17:29:12 -07:00
Chao-Ying Fu
9f49f16bdf
Support getrlimit and setrlimit for MIPS.
...
Change-Id: Iff030a0eb2444bd1ba75dff9ba6b76c7cf9e0e7d
2012-08-21 17:24:01 -07:00
Andrew Hsieh
d27250b263
Merge "Support poll for MIPS."
2012-08-21 17:17:57 -07:00
The Android Open Source Project
54c69adcf8
am 1b5166d5: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '1b5166d568d2eafbe30f302f82775736a27fd7f0':
2012-08-21 16:07:00 -07:00
The Android Open Source Project
1b5166d568
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I92970980359d14bf768069fe63d21c25ebb7019e
2012-08-21 16:05:01 -07:00
Chao-Ying Fu
4cd3283046
Support poll for MIPS.
...
Change-Id: I1299817ea06c9f9ff5701dce0c6166370ef9e87d
2012-08-21 15:27:38 -07:00
The Android Automerger
09e05e8459
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-21 06:33:45 -07:00
Andrew Hsieh
fc638f96ae
Add a .note.android.ident section to Android ELF binaries
...
See related CL:
https://android-review.googlesource.com/#/c/37590
Change-Id: I1d5ab2f754731e9995061de560389c0efa121dea
2012-08-21 18:50:08 +08:00
Andrew Hsieh
0067b6b2cd
am 74f5f803: am 14f0370c: am 75dc23df: am ef423edc: am e3cfaa6d: Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
...
* commit '74f5f8032de3b42c03689ab92368831db86a8886':
Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
2012-08-21 03:34:43 -07:00