Andrew Hsieh
f37f01b084
am 7ccd822d: am e6915e0e: Merge "Fix X86 sigsetjmp and siglongjmp"
...
* commit '7ccd822d1b56bcace157534ff9b5e0551e278908':
Fix X86 sigsetjmp and siglongjmp
2013-03-15 08:43:18 -07:00
Andrew Hsieh
7ccd822d1b
am e6915e0e: Merge "Fix X86 sigsetjmp and siglongjmp"
...
* commit 'e6915e0e08a2a6b96f882e4b5e7fbdaa9496a43f':
Fix X86 sigsetjmp and siglongjmp
2013-03-15 08:40:31 -07:00
Andrew Hsieh
e6915e0e08
Merge "Fix X86 sigsetjmp and siglongjmp"
2013-03-15 15:32:44 +00:00
Andrew Hsieh
228a227967
Fix X86 sigsetjmp and siglongjmp
...
Both exist in header android-X/arch-<arch>/usr/include/setjmp.h
already. Add to X86 to be consistent with header and other archs
ARM/MIPS
See https://code.google.com/p/android/issues/detail?id=19851
Change-Id: I635c6c0491f5bf2aaa9013f23cb4b1bf7cb57a40
2013-03-14 14:40:37 -07:00
Andrew Hsieh
5348bb08d3
am 39720af9: am 426b6b15: am d7faff47: Merge "Added struct Elf32_auxv_t and Elf64_auxv_t"
...
* commit '39720af97a34e9ba549234c0ce3d75d3e526b2a8':
Added struct Elf32_auxv_t and Elf64_auxv_t
2013-03-14 20:47:05 +00:00
Andrew Hsieh
b26d4b6294
am 76d9d4fe: am 55d2aa7d: am 342a2ae9: Merge "Fix OpenSLES_AndroidConfiguration.h to be usable for C code"
...
* commit '76d9d4fe93f9c17fc1af9d035925218b627b480d':
Fix OpenSLES_AndroidConfiguration.h to be usable for C code
2013-03-14 20:47:04 +00:00
Andrew Hsieh
39720af97a
am 426b6b15: am d7faff47: Merge "Added struct Elf32_auxv_t and Elf64_auxv_t"
...
* commit '426b6b15a128a30fa55e0e32f4e076dec8f0ed72':
Added struct Elf32_auxv_t and Elf64_auxv_t
2013-03-14 13:41:03 -07:00
Andrew Hsieh
76d9d4fe93
am 55d2aa7d: am 342a2ae9: Merge "Fix OpenSLES_AndroidConfiguration.h to be usable for C code"
...
* commit '55d2aa7dd5bf7d8a7b942632619bde13324ee903':
Fix OpenSLES_AndroidConfiguration.h to be usable for C code
2013-03-14 13:41:02 -07:00
Andrew Hsieh
426b6b15a1
am d7faff47: Merge "Added struct Elf32_auxv_t and Elf64_auxv_t"
...
* commit 'd7faff47ab2ca2294326aea261fb0cfac18a7d35':
Added struct Elf32_auxv_t and Elf64_auxv_t
2013-03-14 13:38:32 -07:00
Andrew Hsieh
55d2aa7dd5
am 342a2ae9: Merge "Fix OpenSLES_AndroidConfiguration.h to be usable for C code"
...
* commit '342a2ae9f28849f6c388faf3f289b64c4bbbb0b3':
Fix OpenSLES_AndroidConfiguration.h to be usable for C code
2013-03-14 13:38:32 -07:00
Andrew Hsieh
d7faff47ab
Merge "Added struct Elf32_auxv_t and Elf64_auxv_t"
2013-03-14 20:28:20 +00:00
Andrew Hsieh
342a2ae9f2
Merge "Fix OpenSLES_AndroidConfiguration.h to be usable for C code"
2013-03-14 20:27:55 +00:00
Fabrice Di Meglio
4c2bcb717f
am f6151b66: Merge "Fix #8185319 Need to put Android BidiFormatter into the Support Library" into jb-mr2-dev
...
* commit 'f6151b661a719a1c825043d277aea6834c079d8f':
Fix #8185319 Need to put Android BidiFormatter into the Support Library
2013-03-14 19:53:14 +00:00
Raphael Moll
7afc4d7d37
am 5b698437: am b3825b54: am d791f1f8: Merge "Build SDK using prebuilts/devtools."
...
* commit '5b698437398040b69225351aba797d40f20c26db':
Build SDK using prebuilts/devtools.
2013-03-14 19:53:13 +00:00
Fabrice Di Meglio
f6151b661a
Merge "Fix #8185319 Need to put Android BidiFormatter into the Support Library" into jb-mr2-dev
2013-03-14 19:48:29 +00:00
Raphael Moll
5b69843739
am b3825b54: am d791f1f8: Merge "Build SDK using prebuilts/devtools."
...
* commit 'b3825b548848cf6bd9c7659985cb407ea0fda94c':
Build SDK using prebuilts/devtools.
2013-03-14 12:47:36 -07:00
Fabrice Di Meglio
65e58fe5c9
Fix #8185319 Need to put Android BidiFormatter into the Support Library
...
- add demo into Support4Demos
Change-Id: I041144510c907dd1639ea56c45321486d86fe859
2013-03-14 12:00:10 -07:00
Raphael Moll
b3825b5488
am d791f1f8: Merge "Build SDK using prebuilts/devtools."
...
* commit 'd791f1f816f0ba4a3f50a87eaf8ce7001159aedf':
Build SDK using prebuilts/devtools.
2013-03-14 11:44:07 -07:00
Raphael Moll
d791f1f816
Merge "Build SDK using prebuilts/devtools."
2013-03-14 18:31:48 +00:00
Andrew Hsieh
1d1bc5287d
Fix OpenSLES_AndroidConfiguration.h to be usable for C code
...
See https://code.google.com/p/android/issues/detail?id=53163
Change-Id: I0eaa3f93860134daf7d589696e47828166fbc899
2013-03-14 10:33:15 -07:00
Jaikumar Ganesh
db9eea779a
am a54d53a6: Revert "Add Trigger Sensor API Demo."
...
* commit 'a54d53a656079ca26f7f7ee87a58ec8cc11b3283':
Revert "Add Trigger Sensor API Demo."
2013-03-14 02:34:23 +00:00
Andrew Hsieh
42d3d471be
am c1558531: am 183b2ce3: am dede575e: Merge "Make libportable.a compile on host"
...
* commit 'c15585319ef524f9afeaf3c744987eed10a5df84':
Make libportable.a compile on host
2013-03-14 02:33:41 +00:00
Andrew Hsieh
c4e201a35c
Added struct Elf32_auxv_t and Elf64_auxv_t
...
See https://code.google.com/p/android/issues/detail?id=38441
Change-Id: If06ec47d4e15639461c044248e3fe0020748b305
2013-03-13 19:21:56 -07:00
Raphael Moll
645a29c837
Build SDK using prebuilts/devtools.
...
Change-Id: I6fd6ba28b4739c3a14bfa3bac328322e85c5686b
2013-03-13 17:45:25 -07:00
Jaikumar Ganesh
a54d53a656
Revert "Add Trigger Sensor API Demo."
...
This reverts commit 50435d3e6f .
2013-03-13 14:58:01 -07:00
Jeff Brown
fe59fa4d7b
am fd5a3f30: Samples for media router support library.
...
* commit 'fd5a3f30de4ef0cf1119089d547bba6b36ad0068':
Samples for media router support library.
2013-03-13 17:24:47 +00:00
Andrew Hsieh
c15585319e
am 183b2ce3: am dede575e: Merge "Make libportable.a compile on host"
...
* commit '183b2ce3b14157c735f585b1b627d546a1f619fa':
Make libportable.a compile on host
2013-03-13 09:06:15 -07:00
Andrew Hsieh
183b2ce3b1
am dede575e: Merge "Make libportable.a compile on host"
...
* commit 'dede575e48079f9f0970796ffe1f471a30c5d97c':
Make libportable.a compile on host
2013-03-13 09:04:42 -07:00
Andrew Hsieh
dede575e48
Merge "Make libportable.a compile on host"
2013-03-13 15:57:30 +00:00
Andrew Hsieh
8052dc36d9
Make libportable.a compile on host
...
where cutils/log.h doesn't exit
Change-Id: I0ed6389a28f419f90ccbc6719b72895b366bb611
2013-03-12 22:48:28 -07:00
Jeff Brown
fd5a3f30de
Samples for media router support library.
...
Change-Id: I3c578f61e310b552b0dd372dc27c709c35193bbd
2013-03-12 21:34:38 -07:00
Andy McFadden
0cff54987a
am c0a854fa: Merge "More include paths" into jb-mr2-dev
...
* commit 'c0a854fa7b36fcdd77564eb73a8204b74d04abed':
More include paths
2013-03-12 23:33:39 +00:00
Andy McFadden
c0a854fa7b
Merge "More include paths" into jb-mr2-dev
2013-03-12 23:31:14 +00:00
Jaikumar Ganesh
5d2c955a69
am 50435d3e: Add Trigger Sensor API Demo.
...
* commit '50435d3e6f13f1faca9d743bd4f29791e8a4931d':
Add Trigger Sensor API Demo.
2013-03-12 23:14:22 +00:00
Andy McFadden
f0ed2f95f7
More include paths
...
Added two AV-related include paths.
Change-Id: I70b703b82943f3c8a473ef8f7fc0f7188cab9aef
2013-03-12 15:14:45 -07:00
Jaikumar Ganesh
50435d3e6f
Add Trigger Sensor API Demo.
...
Add sensor API demo for significant motion sensor.
Change-Id: I9d55fef52bdda2b804003bb07d6d977f13cda5b0
2013-03-12 14:13:21 -07:00
Jeff Sharkey
90c1aea72b
am dafe2546: Merge "Example code for FileProvider." into jb-mr2-dev
...
* commit 'dafe2546c9b83f41903ea726f8ff4d74730c9c1f':
Example code for FileProvider.
2013-03-12 17:20:04 +00:00
Jeff Sharkey
dafe2546c9
Merge "Example code for FileProvider." into jb-mr2-dev
2013-03-12 17:13:16 +00:00
Michael Wright
6e9f145875
am def9515c: Merge "Update ApiDemos to use new input source check" into jb-mr2-dev
...
* commit 'def9515cb018807a5f441fe27e621759bdcd5b6b':
Update ApiDemos to use new input source check
2013-03-12 02:14:37 +00:00
Michael Wright
def9515cb0
Merge "Update ApiDemos to use new input source check" into jb-mr2-dev
2013-03-12 02:10:47 +00:00
Roman Nurik
88087ad0ca
am 574bec3b: am 573642d8: am f3084087: am ee77f868: am 85364937: Add InteractiveChart sample code for update to Gestures training class.
...
* commit '574bec3b90b494d98c88378689983027c8b773e4':
Add InteractiveChart sample code for update to Gestures training class.
2013-03-11 23:36:14 +00:00
Jean-Baptiste Queru
dc86028f31
am 05f409b6: (-s ours) am 240f3771: am 86dea47b: am 0327ed0d: am 0c0bad05: (-s ours) am 4aed7b07: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '05f409b61cb1ac0d33db6fc16ad126e441212260':
2013-03-11 23:36:13 +00:00
Adam Koch
afba7d0d3a
am d40239e3: am 8ae5c7b6: am 0fd0b16f: am 005ea967: am 0ff44f00: am 5f51b7fb: Bitmapfun Sample: Add some docs and clean up some method naming.
...
* commit 'd40239e3d2b34f4109e831f28f1640998efb04a9':
2013-03-11 23:36:12 +00:00
Adam Koch
81962b5f7d
am f6749fe8: am fa7910ed: am 9b58e08b: am 36893523: am 0c5b72b4: am e826ee24: Merge "Bitmapfun Sample: Add additional sample images." into jb-mr1-dev
...
* commit 'f6749fe8b448f4c747ccf7e27f2b5b85509ee041':
2013-03-11 23:36:11 +00:00
Chris Banes
b3cd03c0d5
am 4f0b10aa: am 0e21e8b9: am 22c2d527: am 56eb96fc: am ac5a7844: am c5d5c3db: Merge "bitmapfun: Add support to use inBitmap option" into jb-mr1-dev
...
* commit '4f0b10aa1ed52382dcefd3c539c3a89165e7e1a3':
2013-03-11 23:36:11 +00:00
Roman Nurik
574bec3b90
am 573642d8: am f3084087: am ee77f868: am 85364937: Add InteractiveChart sample code for update to Gestures training class.
...
* commit '573642d8e9fdb5fbd1d2a7cd9a0a9fe0204eacd7':
Add InteractiveChart sample code for update to Gestures training class.
2013-03-11 16:31:38 -07:00
Jean-Baptiste Queru
05f409b61c
am 240f3771: am 86dea47b: am 0327ed0d: am 0c0bad05: (-s ours) am 4aed7b07: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '240f37715ec6eeeeca9b857cbbcf3a9e3037b17a':
2013-03-11 16:31:38 -07:00
Adam Koch
d40239e3d2
am 8ae5c7b6: am 0fd0b16f: am 005ea967: am 0ff44f00: am 5f51b7fb: Bitmapfun Sample: Add some docs and clean up some method naming.
...
* commit '8ae5c7b6f98a5bdb7d7d1908935030aa88d89e1e':
2013-03-11 16:31:37 -07:00
Adam Koch
f6749fe8b4
am fa7910ed: am 9b58e08b: am 36893523: am 0c5b72b4: am e826ee24: Merge "Bitmapfun Sample: Add additional sample images." into jb-mr1-dev
...
* commit 'fa7910ed26c15cd4522af32194ebf6816bff9a66':
2013-03-11 16:31:36 -07:00
Chris Banes
4f0b10aa1e
am 0e21e8b9: am 22c2d527: am 56eb96fc: am ac5a7844: am c5d5c3db: Merge "bitmapfun: Add support to use inBitmap option" into jb-mr1-dev
...
* commit '0e21e8b9edc7efdaf7e2cc2fbff35e7f517a272d':
2013-03-11 16:31:35 -07:00