Andrew Hsieh
83bd985ec6
am 470ec2be: am 0423f030: am 28c9c34d: am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
...
* commit '470ec2be44ad2bed606ec9cdd7dcbdfc56de1b89':
Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 09:20:25 -08:00
Andrew Hsieh
470ec2be44
am 0423f030: am 28c9c34d: am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
...
* commit '0423f030642f78d0e107b3c43b75b0ff11fc2e3e':
Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 17:17:28 +00:00
Andrew Hsieh
0423f03064
am 28c9c34d: am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
...
* commit '28c9c34d8670266add371e9f0f33e4da52a024f4':
Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 17:14:37 +00:00
Andrew Hsieh
28c9c34d86
am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
...
* commit '6d2d58de54169cd2cae9dbf3f69bd52af87daae5':
Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 09:09:56 -08:00
Andrew Hsieh
6d2d58de54
Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
2014-01-16 17:02:36 +00:00
Amith Yamasani
17bfc71291
am a7244cfc: am 52cf96e9: Merge "Update eclipse classpath due to change in directory structure" into klp-modular-dev
...
* commit 'a7244cfc93edb8dabc35f258ec828e358d61befa':
Update eclipse classpath due to change in directory structure
2014-01-15 14:11:41 -08:00
Amith Yamasani
a7244cfc93
am 52cf96e9: Merge "Update eclipse classpath due to change in directory structure" into klp-modular-dev
...
* commit '52cf96e9aa650ff50a0a25924e81bec35be56c4f':
Update eclipse classpath due to change in directory structure
2014-01-15 22:08:57 +00:00
Amith Yamasani
52cf96e9aa
Merge "Update eclipse classpath due to change in directory structure" into klp-modular-dev
2014-01-15 22:06:55 +00:00
Andrew Hsieh
02f789fb4e
am bee62e6e: am 926d852a: am 1c9e7361: am 3517e742: Merge "Implement wait4 already exist in header"
...
* commit 'bee62e6e924c6e5f44511d5523467f549e95c12b':
Implement wait4 already exist in header
2014-01-09 17:57:49 -08:00
Andrew Hsieh
bee62e6e92
am 926d852a: am 1c9e7361: am 3517e742: Merge "Implement wait4 already exist in header"
...
* commit '926d852a5b838f0faa632839c31c4274e93cf200':
Implement wait4 already exist in header
2014-01-10 01:54:30 +00:00
Andrew Hsieh
926d852a5b
am 1c9e7361: am 3517e742: Merge "Implement wait4 already exist in header"
...
* commit '1c9e736166ee6d00962360d1a41a840862346562':
Implement wait4 already exist in header
2014-01-10 00:41:31 +00:00
Andrew Hsieh
1c9e736166
am 3517e742: Merge "Implement wait4 already exist in header"
...
* commit '3517e742e3df5a61e622204dbb8d4110b5bad3ac':
Implement wait4 already exist in header
2014-01-09 16:36:48 -08:00
Andrew Hsieh
3517e742e3
Merge "Implement wait4 already exist in header"
2014-01-10 00:31:50 +00:00
Xavier Ducrohet
229a9f3dab
am 054d7849: resolved conflicts for merge of 7d85d0a9 to master
...
* commit '054d78497e129e5dea545e7ea76692aec1bb387f':
Update build tools to 19.0.2
2014-01-09 13:33:41 -08:00
Xavier Ducrohet
817e252bd8
am 39c7e520: am 699fdf70: am c7e44de1: am cd171fd3: am 7f15ddd5: Properly package the RS support bc file.
...
* commit '39c7e520bc9df1907ceff3020ce8a80348baa341':
Properly package the RS support bc file.
2014-01-09 13:33:40 -08:00
Andrew Hsieh
dcf33b9c45
am 73524a91: am bc5de16b: am e89c4f7f: am 365e66fe: Merge "Fixed API18 math.h for clang3.4"
...
* commit '73524a91cd2d136099169640e46b96a9135dcbe8':
Fixed API18 math.h for clang3.4
2014-01-09 13:33:38 -08:00
Andrew Hsieh
62bc88bcc6
am 7967d358: am 1fd910a7: am cbe87010: am 29c857fe: Merge "Restore immersive mode when volume button has been pressed."
...
* commit '7967d358ffab5f86a74bbf6bed229af08595c4ee':
Restore immersive mode when volume button has been pressed.
2014-01-09 13:33:37 -08:00
Andrew Hsieh
acedfdee98
am 8eff33c2: am 0862223e: am 412eed7a: am 13f2b7e1: Merge "Fix rendering issue in Tegra2/3."
...
* commit '8eff33c2c3500fa1965d43e8c0a554c53a72b45a':
Fix rendering issue in Tegra2/3.
2014-01-09 13:33:33 -08:00
Andrew Hsieh
10826fb286
am 5ed6ffdc: am 4ecd37d0: am 57ebb3aa: am 7c35de7f: Merge "Add support for building the NDK\'s native_app_glue."
...
* commit '5ed6ffdc63dba83c1571e4f986543efdf4111803':
Add support for building the NDK's native_app_glue.
2014-01-09 13:33:32 -08:00
Andrew Hsieh
d445647f01
am 575bd012: am d9abded2: am 7a432f8c: am 11728ce9: Merge "Workaround the __builtin_isnan() type error for clang 3.4."
...
* commit '575bd012531d12c652faac16970108ab82b37047':
Workaround the __builtin_isnan() type error for clang 3.4.
2014-01-09 13:33:31 -08:00
Christopher Ferris
a608337839
am ad9fef85: am a8a66a4e: am 3356457a: am 9092f8fb: Merge "Use uapi kernel headers."
...
* commit 'ad9fef85c10653d5158fe8237b3bcf3f3be49307':
Use uapi kernel headers.
2014-01-09 13:33:30 -08:00
Adam Powell
a094ce5677
am d6ffb0ae: am 544a42f0: Example activity for RecyclerView
...
* commit 'd6ffb0ae6d8ebe371491abf4a03689c5b0b5fa79':
Example activity for RecyclerView
2014-01-09 13:33:29 -08:00
Tor Norbye
ac65c5ac91
am 09ace69a: Remove Nullable annotation
...
* commit '09ace69a89cff377069a85602684b273a0aa4da1':
Remove Nullable annotation
2014-01-09 13:33:27 -08:00
Andrew Hsieh
a95b29a1b4
am 0e502601: am 2ead849b: am 0c5907b3: am 2f5fa0be: Merge "ndk: Fix wait4() declarations"
...
* commit '0e502601754db236780437c5fe9bd95b26a65936':
ndk: Fix wait4() declarations
2014-01-09 13:33:21 -08:00
Narayan Kamath
7a3759d4a8
am 10e82353: am 7d3b1cc2: am 4ebf0371: am 1e18a584: Merge "Whitelist libziparchive for windows."
...
* commit '10e82353220a477e014d24541c94338bf89922a9':
Whitelist libziparchive for windows.
2014-01-09 13:33:20 -08:00
George Mount
9d675bc04f
am 3dd963e5: Merge "Add Trim Path API demo."
...
* commit '3dd963e596e2ad84f5ea38cc248d172f800ebfd3':
Add Trim Path API demo.
2014-01-09 13:33:19 -08:00
Qiwen Zhao
0afedc0682
am 21657766: am a924e71c: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
...
* commit '2165776685089613021f6ec6b34205d936dc2da1':
2014-01-09 13:33:18 -08:00
Qiwen Zhao
98f5f30db5
am a924e71c: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
...
* commit 'a924e71c93511ac0ad5456ec3a1ca7dfd35f2c79':
2014-01-09 13:33:17 -08:00
Baligh Uddin
7639f8d7e6
am 44c0b09b: Remove deprecated locales
...
* commit '44c0b09b7b4961b04d5437e773c55fde78034d5e':
Remove deprecated locales
2014-01-09 13:33:11 -08:00
Qiwen Zhao
8a0d04b9f7
am 01bd07ca: (-s ours) am 5e84ff2c: (-s ours) snap to klp-dev-plus-aosp f57b1e0 with history
...
* commit '01bd07ca25199cbc588ec72e70074eb3f7f33b74':
2014-01-09 13:33:10 -08:00
Andrew Hsieh
fbb32955a4
Fixed asset_manager.h, rect_manager.h, and jni.h
...
1. Fixed missing #include <sys/types.h> in android/asset_manager.h for API >= 13
2. Fixed missing #include <stdint.h> in android/rect_manager.h for API >= 14
3. Added JNICALL to JNI_OnLoad and JNI_OnUnload in jni.h
Change-Id: I875ec0b6e6f7c2f433c176f0a738eb78f3c33062
2014-01-08 14:10:06 +08:00
Xavier Ducrohet
054d78497e
resolved conflicts for merge of 7d85d0a9 to master
...
Change-Id: Ib04573eb46878537c5135d09dc62ee753377ec14
2014-01-07 13:21:20 -06:00
Xavier Ducrohet
39c7e520bc
am 699fdf70: am c7e44de1: am cd171fd3: am 7f15ddd5: Properly package the RS support bc file.
...
* commit '699fdf70319ed2f5842216c0ade4118b9f236f49':
Properly package the RS support bc file.
2014-01-07 19:07:32 +00:00
Xavier Ducrohet
7d85d0a99c
am d3795c4d: am 8c2f72eb: am 0a56aecd: Update build tools to 19.0.2
...
* commit 'd3795c4da6c0652c29e339cab24b28f27ac96f46':
Update build tools to 19.0.2
2014-01-07 18:12:47 +00:00
Xavier Ducrohet
699fdf7031
am c7e44de1: am cd171fd3: am 7f15ddd5: Properly package the RS support bc file.
...
* commit 'c7e44de1962a3c9e56645213d6b58bc08cf4597e':
Properly package the RS support bc file.
2014-01-07 18:12:46 +00:00
Xavier Ducrohet
d3795c4da6
am 8c2f72eb: am 0a56aecd: Update build tools to 19.0.2
...
* commit '8c2f72ebc8a34704da0f9dce5cf53cf7f8afeee2':
Update build tools to 19.0.2
2014-01-07 10:06:50 -08:00
Xavier Ducrohet
c7e44de196
am cd171fd3: am 7f15ddd5: Properly package the RS support bc file.
...
* commit 'cd171fd352aa8e6e1d1bc903038a81b7702f6d7a':
Properly package the RS support bc file.
2014-01-07 10:06:49 -08:00
Xavier Ducrohet
8c2f72ebc8
am 0a56aecd: Update build tools to 19.0.2
...
* commit '0a56aecdbbfb3e3e08a73c7411f41f5c7f0cabaa':
Update build tools to 19.0.2
2014-01-07 10:03:43 -08:00
Xavier Ducrohet
cd171fd352
am 7f15ddd5: Properly package the RS support bc file.
...
* commit '7f15ddd546be5203f8de654ff36885f629490813':
Properly package the RS support bc file.
2014-01-07 10:03:42 -08:00
Andrew Hsieh
73524a91cd
am bc5de16b: am e89c4f7f: am 365e66fe: Merge "Fixed API18 math.h for clang3.4"
...
* commit 'bc5de16b6b7e57ab70341d1929435ce1ab5e1f69':
Fixed API18 math.h for clang3.4
2014-01-07 00:33:09 +00:00
Andrew Hsieh
bc5de16b6b
am e89c4f7f: am 365e66fe: Merge "Fixed API18 math.h for clang3.4"
...
* commit 'e89c4f7f47d97f2dd8de00a47c0bbc20e790c922':
Fixed API18 math.h for clang3.4
2014-01-07 00:30:50 +00:00
Andrew Hsieh
e89c4f7f47
am 365e66fe: Merge "Fixed API18 math.h for clang3.4"
...
* commit '365e66feaf8f653fdc1618f6e220207a28bb4bc6':
Fixed API18 math.h for clang3.4
2014-01-06 16:26:01 -08:00
Andrew Hsieh
365e66feaf
Merge "Fixed API18 math.h for clang3.4"
2014-01-07 00:21:56 +00:00
Xavier Ducrohet
0a56aecdbb
Update build tools to 19.0.2
...
Change-Id: I339c292aece1101a6afaf89db20a9d985427e561
2014-01-02 16:24:41 -08:00
Xavier Ducrohet
7f15ddd546
Properly package the RS support bc file.
...
Change-Id: Ia55b597085c97cb07029b812392a618a4670ff36
2014-01-02 16:24:21 -08:00
Andrew Hsieh
7967d358ff
am 1fd910a7: am cbe87010: am 29c857fe: Merge "Restore immersive mode when volume button has been pressed."
...
* commit '1fd910a7df81df13f53c839ed895951166e7c9bb':
Restore immersive mode when volume button has been pressed.
2013-12-30 18:09:10 +00:00
Andrew Hsieh
8eff33c2c3
am 0862223e: am 412eed7a: am 13f2b7e1: Merge "Fix rendering issue in Tegra2/3."
...
* commit '0862223e51f5727f7cf1d50f43310c555282ad49':
Fix rendering issue in Tegra2/3.
2013-12-30 18:09:08 +00:00
Andrew Hsieh
f242723e9d
Fixed API18 math.h for clang3.4
...
Clang3.4 can take __builtin_nexttoward and __builtin_nexttowardf.
Also fix a minor typo in comment
Change-Id: If98a35e2e38c45ebd619b0ceb6c5ee41acc4e415
2013-12-30 14:14:09 +08:00
Andrew Hsieh
1fd910a7df
am cbe87010: am 29c857fe: Merge "Restore immersive mode when volume button has been pressed."
...
* commit 'cbe870105d87898f4ed8687fde0952143946962e':
Restore immersive mode when volume button has been pressed.
2013-12-30 06:10:21 +00:00
Andrew Hsieh
0862223e51
am 412eed7a: am 13f2b7e1: Merge "Fix rendering issue in Tegra2/3."
...
* commit '412eed7a9414317bc3f591fb9cb1c5a28a2f5974':
Fix rendering issue in Tegra2/3.
2013-12-30 06:10:20 +00:00