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
Hak Matsuda
f39a078023
Add NDK sample to demonstrate more OpenGL&Gaming related technologies.
...
Change-Id: I0fb56c1fd1aa82d5a7c4da5010e00e103146ba78
2013-09-13 15:12:22 +08:00
Tor Norbye
784abcfaf1
Temporarily disable removing typedefs
...
Change-Id: Ief7cb3b570d2b36b7101f622ab77cbdf7d699e3e
2013-09-12 17:09:59 -07:00
The Android Automerger
89b09c486c
merge in klp-release history after reset to klp-dev
2013-09-12 06:00:53 -07:00
Yohann Roussel
6fa1156b3b
Add res folder to multidex SDK projects.
...
This will fix an error when importing thoses projects with ADT.
Change-Id: I75d2b0376222b13d630ef7e53386dedf62cc3fec
2013-09-12 07:51:54 +00:00
Yohann Roussel
2ee7919660
Merge "android-support-multidex-instrumentation in SDK."
2013-09-12 07:34:34 +00:00
Baligh Uddin
908bcaebb0
Merge "Import translations. DO NOT MERGE"
2013-09-12 03:13:38 +00:00
Erik Gilling
aeac590137
am 1c415cbb: am 438ea813: Add Consumer IR ApiDemo
...
* commit '1c415cbb54621f5e86dfc8364a29eaf9e35c67b5':
Add Consumer IR ApiDemo
2013-09-11 17:22:57 -07:00
Baligh Uddin
dfd89ed284
Import translations. DO NOT MERGE
...
Change-Id: Id816a500425dc981c2cacf2ca4244590b297418f
Auto-generated-cl: translation import
2013-09-11 15:17:43 -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
Yohann Roussel
6f57b24889
android-support-multidex-instrumentation in SDK.
...
Change-Id: I6e39034f592f6ad7654ee37970f3367a87b2034f
2013-09-11 08:05:14 +00:00
Erik Gilling
438ea813f1
Add Consumer IR ApiDemo
...
Change-Id: I4eb27b2ba6a46c27962eaa5e09d3e65939b64c0a
2013-09-10 21:07:58 -07:00