The Android Automerger
a7edd6eaee
merge in klp-release history after reset to klp-dev
2013-09-17 21:10:54 -07:00
Andrew Hsieh
c517c3dd34
am d496950e: am 06485c81: Merge "Move Teapot to android-17 and set APP_ABI := all"
...
* commit 'd496950e94883a83348df563c1be26fee95bec4f':
Move Teapot to android-17 and set APP_ABI := all
2013-09-17 18:59:59 -07:00
Andrew Hsieh
d496950e94
am 06485c81: Merge "Move Teapot to android-17 and set APP_ABI := all"
...
* commit '06485c81bbc79b02acfbe986e378216adab573c2':
Move Teapot to android-17 and set APP_ABI := all
2013-09-17 18:58:25 -07:00
Andrew Hsieh
06485c81bb
Merge "Move Teapot to android-17 and set APP_ABI := all"
2013-09-18 01:55:54 +00:00
Andrew Hsieh
c0fa6ffad4
am 016338e0: am 3199e150: Merge "Fixed array-index-out-of-bound in Teapot sample"
...
* commit '016338e0ec30f566d7659f4ea91bc786cf93845e':
Fixed array-index-out-of-bound in Teapot sample
2013-09-17 18:40:11 -07:00
Andrew Hsieh
016338e0ec
am 3199e150: Merge "Fixed array-index-out-of-bound in Teapot sample"
...
* commit '3199e1502382a037e6bb9b3ae11429fc18fe9917':
Fixed array-index-out-of-bound in Teapot sample
2013-09-17 18:38:45 -07:00
Andrew Hsieh
3199e15023
Merge "Fixed array-index-out-of-bound in Teapot sample"
2013-09-18 01:36:02 +00:00
The Android Automerger
cc52140d8e
merge in klp-release history after reset to klp-dev
2013-09-17 17:39:43 -07:00
The Android Automerger
7dc8cbe3d8
merge in klp-release history after reset to klp-dev
2013-09-17 06:00:21 -07:00
Alan Viverette
a81b5e68dc
am ff306b66: Merge "Fix drawer mirroring in Support4Demos" into klp-dev
...
* commit 'ff306b6613111765f33de105db750e33dec60f01':
Fix drawer mirroring in Support4Demos
2013-09-16 12:30:04 -07:00
Alan Viverette
ff306b6613
Merge "Fix drawer mirroring in Support4Demos" into klp-dev
2013-09-16 19:27:36 +00:00
The Android Automerger
eb8cc88787
merge in klp-release history after reset to klp-dev
2013-09-16 06:00:42 -07:00
Andrew Hsieh
1b8ffe3331
Move Teapot to android-17 and set APP_ABI := all
...
For the default configuration to run on more devices: ARM/Intel/MIPS >= API17
Change-Id: I52145374d0c51624c7a295dc8092f8492e591dee
2013-09-16 10:32:55 +08:00
Iceberg Fu
f74a8b0a63
Fixed array-index-out-of-bound in Teapot sample
...
Fix issue used to crash on MIPS/X86 device. ARM device works by accident
Change-Id: I401f4954841b6f59d3ea001e5e6a70c46045a7e1
2013-09-16 10:17:17 +08:00
Baligh Uddin
de7cabb59f
am e58ed1e1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'e58ed1e1169dba888788db16ebbbcc108748c4b9':
Import translations. DO NOT MERGE
2013-09-14 21:39:31 -07:00
Baligh Uddin
6f8236f423
am 5f059130: (-s ours) Import translations. DO NOT MERGE
...
* commit '5f0591306e0b57d83dbd258762d5f9ff110b155a':
Import translations. DO NOT MERGE
2013-09-14 21:39:30 -07:00
Baligh Uddin
e58ed1e116
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-09-15 04:36:35 +00:00
Baligh Uddin
af7deadeb6
Import translations. DO NOT MERGE
...
Change-Id: I048d3dbf36e0e9a0ba104a15452e9be03542bdff
Auto-generated-cl: translation import
2013-09-14 21:04:51 -07:00
Baligh Uddin
5f0591306e
Import translations. DO NOT MERGE
...
Change-Id: Ice1879d3c77ba10781b1b75e218f3a56cec8b2c2
Auto-generated-cl: translation import
2013-09-14 21:01:31 -07:00
Alan Viverette
8a30cb9940
Fix drawer mirroring in Support4Demos
...
BUG: 10209321
Change-Id: I2a96fb2448a30a1635920346826f598d09decf20
2013-09-13 16:04:26 -07:00
Andrew Hsieh
a0bd157aa2
am 539c54da: am cfb3c3ff: Merge "Fix sample bitmap-plasma to draw on whole screen"
...
* commit '539c54da923f0200294dde3e4ba80a9aa48e49f3':
Fix sample bitmap-plasma to draw on whole screen
2013-09-13 04:48:04 -07:00
Andrew Hsieh
79d33b2b52
am 6cb8f771: am eb0b5623: Merge "Fix error about multiple unsequenced modifications"
...
* commit '6cb8f77156f09489e1bb685d306c9f81e3e5dc98':
Fix error about multiple unsequenced modifications
2013-09-13 04:48:03 -07:00
Andrew Hsieh
539c54da92
am cfb3c3ff: Merge "Fix sample bitmap-plasma to draw on whole screen"
...
* commit 'cfb3c3ff05c9eacecfa60f68a2a0128b344a0cba':
Fix sample bitmap-plasma to draw on whole screen
2013-09-13 04:36:07 -07:00
Andrew Hsieh
6cb8f77156
am eb0b5623: Merge "Fix error about multiple unsequenced modifications"
...
* commit 'eb0b56233947b32d8ebaa29db3103cbe2072fd49':
Fix error about multiple unsequenced modifications
2013-09-13 04:35:56 -07:00
Andrew Hsieh
cfb3c3ff05
Merge "Fix sample bitmap-plasma to draw on whole screen"
2013-09-13 11:34:17 +00:00
Andrew Hsieh
eb0b562339
Merge "Fix error about multiple unsequenced modifications"
2013-09-13 11:34:02 +00:00
Andrew Hsieh
055992fa7d
Fix sample bitmap-plasma to draw on whole screen
...
The previous dimension 200x200 is tiny these days
Change-Id: I7d7a7d93b3e60bd4dcd8a2b22b97fc7ed9ca4dfa
2013-09-13 18:29:42 +08:00
Andrew Hsieh
99da728a3d
Fix error about multiple unsequenced modifications
...
The evaluation order of function args aren't gaurenteed in C++
jni/NDKSupport/vecmath.h:869:32: warning: multiple unsequenced modifications to 'i' [-Wunsequenced]
LOGI("%f %f %f %f", f[i++], f[i++], f[i++], f[i++]);
Change-Id: Ibf69978dd3abf57a7042624aad3d416a0f6f5e01
2013-09-13 17:47:47 +08:00
Andrew Hsieh
56896f8f5e
am 18bdd9b2: am 83e093e9: Merge "Add NDK sample to demonstrate more OpenGL&Gaming related technologies."
...
* commit '18bdd9b22a5400e70581d1b1771bc79c70f98493':
Add NDK sample to demonstrate more OpenGL&Gaming related technologies.
2013-09-13 00:39:21 -07:00
Andrew Hsieh
18bdd9b22a
am 83e093e9: Merge "Add NDK sample to demonstrate more OpenGL&Gaming related technologies."
...
* commit '83e093e9a2f7c428b85e013d10cf20eb204d0062':
Add NDK sample to demonstrate more OpenGL&Gaming related technologies.
2013-09-13 00:35:53 -07:00
Andrew Hsieh
83e093e9a2
Merge "Add NDK sample to demonstrate more OpenGL&Gaming related technologies."
2013-09-13 07:33:26 +00:00
Hak Matsuda
f39a078023
Add NDK sample to demonstrate more OpenGL&Gaming related technologies.
...
Change-Id: I0fb56c1fd1aa82d5a7c4da5010e00e103146ba78
2013-09-13 15:12:22 +08:00
The Android Automerger
89b09c486c
merge in klp-release history after reset to klp-dev
2013-09-12 06:00:53 -07:00
Erik Gilling
1c415cbb54
am 438ea813: Add Consumer IR ApiDemo
...
* commit '438ea813f1846f88205ff98436568aaa34f06845':
Add Consumer IR ApiDemo
2013-09-11 12:10:10 -07:00
Erik Gilling
438ea813f1
Add Consumer IR ApiDemo
...
Change-Id: I4eb27b2ba6a46c27962eaa5e09d3e65939b64c0a
2013-09-10 21:07:58 -07:00
The Android Automerger
1716bb09a7
merge in klp-release history after reset to klp-dev
2013-09-09 06:00:57 -07:00
Jeff Sharkey
88241b5291
am 34c8fae5: Add DocumentsUI tests.
...
* commit '34c8fae561288700ccf004fa490da09ebacaaedf':
Add DocumentsUI tests.
2013-09-07 12:25:33 -07:00
Jeff Sharkey
34c8fae561
Add DocumentsUI tests.
...
Bug: 10514613
Change-Id: I1375a8ee421153178f86a1842ebbe572858bf94c
2013-09-06 13:56:45 -07:00
Andrew Hsieh
32f9427ac7
am 14ebb417: am 445765eb: Merge "Fix issue 58135 about _C_LABEL_STRING macro w/o space between literal in C++"
...
* commit '14ebb417006c2686c077f70e9ddbb745bee94493':
Fix issue 58135 about _C_LABEL_STRING macro w/o space between literal in C++
2013-09-06 04:46:29 -07:00
Andrew Hsieh
14ebb41700
am 445765eb: Merge "Fix issue 58135 about _C_LABEL_STRING macro w/o space between literal in C++"
...
* commit '445765ebe5887dccb9c93973024e9e59563adb8d':
Fix issue 58135 about _C_LABEL_STRING macro w/o space between literal in C++
2013-09-06 04:44:14 -07:00
Andrew Hsieh
445765ebe5
Merge "Fix issue 58135 about _C_LABEL_STRING macro w/o space between literal in C++"
2013-09-06 11:42:04 +00:00
Andrew Hsieh
c2e61c3c01
Fix issue 58135 about _C_LABEL_STRING macro w/o space between literal in C++
...
Change-Id: Iefc3c090071f3629998515d43907139b07105672
2013-09-06 17:34:31 +08:00
Andrew Hsieh
c3e07fd8ae
am 09d77363: am 7d80bf6a: Merge "arch-specific diff of header"
...
* commit '09d77363b434071784398589bc932b122b4d45b3':
arch-specific diff of header
2013-09-06 01:36:46 -07:00
Andrew Hsieh
09d77363b4
am 7d80bf6a: Merge "arch-specific diff of header"
...
* commit '7d80bf6ab4e0df5049ccfc241bfb1408bf2e2931':
arch-specific diff of header
2013-09-06 01:35:41 -07:00
Andrew Hsieh
7d80bf6ab4
Merge "arch-specific diff of header"
2013-09-06 08:26:19 +00:00
Andrew Hsieh
d9124876f0
arch-specific diff of header
...
Change-Id: I78e2186dc7e491095201efc2c709f26e8822a076
2013-09-06 16:25:41 +08:00
Dirk Dougherty
ac11f91669
am 73762c8d: am 17b152d9: am 60880978: am fe32c3ad: Adjust tags format in _index.jd files.
...
* commit '73762c8de9d804b13b2c19122257913256e15715':
Adjust tags format in _index.jd files.
2013-09-05 19:35:35 -07:00
Dirk Dougherty
73762c8de9
am 17b152d9: am 60880978: am fe32c3ad: Adjust tags format in _index.jd files.
...
* commit '17b152d9a273987645fa97b0df00a35378efc85a':
Adjust tags format in _index.jd files.
2013-09-05 19:34:14 -07:00
Dirk Dougherty
17b152d9a2
am 60880978: am fe32c3ad: Adjust tags format in _index.jd files.
...
* commit '60880978e61a43624e50a3537819e827a24ff2ae':
Adjust tags format in _index.jd files.
2013-09-05 19:33:05 -07:00
Dirk Dougherty
60880978e6
am fe32c3ad: Adjust tags format in _index.jd files.
...
* commit 'fe32c3ad53be328d445e8c5ce1d3b1f2bdad7166':
Adjust tags format in _index.jd files.
2013-09-05 19:30:18 -07:00