Jason Sams
97628008f4
am ef93ca05: Merge "Fix use of dead APIs." into klp-dev
...
* commit 'ef93ca055b8dfaeff2304784c376cbb0a6c5f073':
Fix use of dead APIs.
2013-09-24 13:25:47 -07:00
Jason Sams
ef93ca055b
Merge "Fix use of dead APIs." into klp-dev
2013-09-24 20:24:11 +00:00
Jason Sams
d1e8cb25b5
Fix use of dead APIs.
...
bug 10752757
Change-Id: I8e145f141eb573456d62b32cf8c10387f666635b
2013-09-23 16:05:44 -07:00
The Android Automerger
30f4ca1dc8
merge in klp-release history after reset to klp-dev
2013-09-22 10:50:33 -07:00
Tor Norbye
5b47af05d5
Re-enable typedef stripping
...
Change-Id: I128b06209223dfc79dc94645847f32df4cd11b1b
2013-09-21 12:37:44 -07:00
Igor Murashkin
8034619c5f
am 03c29dcd: am 893289bf: eclipse classpath: update to include frameworks/ex/camera2
...
* commit '03c29dcd07cae3985388a090a88eb2fc6562f5c2':
eclipse classpath: update to include frameworks/ex/camera2
2013-09-20 16:30:06 -07:00
Igor Murashkin
03c29dcd07
am 893289bf: eclipse classpath: update to include frameworks/ex/camera2
...
* commit '893289bf2507111faebff82e5c66b27a392b13ab':
eclipse classpath: update to include frameworks/ex/camera2
2013-09-20 16:27:37 -07:00
Igor Murashkin
893289bf25
eclipse classpath: update to include frameworks/ex/camera2
...
Change-Id: Icd72ae70c2e8297a1a9c27a9a0ecc4d96fee81b3
2013-09-19 17:34:42 -07:00
The Android Automerger
a7edd6eaee
merge in klp-release history after reset to klp-dev
2013-09-17 21:10:54 -07:00
Andrew Hsieh
91ddbb660f
am c517c3dd: am d496950e: am 06485c81: Merge "Move Teapot to android-17 and set APP_ABI := all"
...
* commit 'c517c3dd34728b31143a3b53362f7eb1f7c9dfd4':
Move Teapot to android-17 and set APP_ABI := all
2013-09-17 19:29:15 -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
015724d1cb
am c0fa6ffa: am 016338e0: am 3199e150: Merge "Fixed array-index-out-of-bound in Teapot sample"
...
* commit 'c0fa6ffad4b05ef845b4545235db06980827bda5':
Fixed array-index-out-of-bound in Teapot sample
2013-09-17 18:42:08 -07: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
fc2774cbfb
am a81b5e68: am ff306b66: Merge "Fix drawer mirroring in Support4Demos" into klp-dev
...
* commit 'a81b5e68dcd65131c6538ab3cbde6fa4d89b696a':
Fix drawer mirroring in Support4Demos
2013-09-16 12:34:32 -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
Ben Cheng
a4953a95a3
Merge "Add "Force a Double Free" button to stress test the tools."
2013-09-16 19:14:28 +00:00
Ben Cheng
f9e0f5b7cf
Add "Force a Double Free" button to stress test the tools.
...
Change-Id: I52bf2f42c9a6040ac345248473d7184b7266f511
2013-09-16 12:12:51 -07: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
a6a19f49c7
am de7cabb5: (-s ours) am e58ed1e1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'de7cabb59f999b28a304eb1c8dc60274bf480d58':
Import translations. DO NOT MERGE
2013-09-14 21:44:44 -07:00
Baligh Uddin
f262580317
am 6f8236f4: (-s ours) am 5f059130: (-s ours) Import translations. DO NOT MERGE
...
* commit '6f8236f423b40bd9c247bdc98e15c9646796af0c':
Import translations. DO NOT MERGE
2013-09-14 21:44:43 -07: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
Baligh Uddin
501ecc50fc
Import translations. DO NOT MERGE
...
Change-Id: Ie3decee38150b828ca6b4dd79b368bcf357000c0
Auto-generated-cl: translation import
2013-09-14 00:03:28 -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
a28b96d040
am a0bd157a: am 539c54da: am cfb3c3ff: Merge "Fix sample bitmap-plasma to draw on whole screen"
...
* commit 'a0bd157aa25321de7b719cff534da9556ed21f67':
Fix sample bitmap-plasma to draw on whole screen
2013-09-13 04:50:41 -07:00
Andrew Hsieh
307a254231
am 79d33b2b: am 6cb8f771: am eb0b5623: Merge "Fix error about multiple unsequenced modifications"
...
* commit '79d33b2b5273afa10b6ffc1382278757492c6720':
Fix error about multiple unsequenced modifications
2013-09-13 04:50:40 -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
53d27f3182
am 56896f8f: am 18bdd9b2: am 83e093e9: Merge "Add NDK sample to demonstrate more OpenGL&Gaming related technologies."
...
* commit '56896f8f5e3cf5d14d9113cee2bb7fb3cf8ed084':
Add NDK sample to demonstrate more OpenGL&Gaming related technologies.
2013-09-13 00:41:45 -07: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