Svetoslav
6c58de49c7
am 659b59ab: am 22af8556: am 40bea547: Merge "Adding an API demo for how to implement printing in an app." into klp-dev
...
* commit '659b59aba986b997162f2746e2087500febf9380':
Adding an API demo for how to implement printing in an app.
2014-01-09 21:35:35 +00:00
Dirk Dougherty
894c3d9560
am 7c4a526b: am dc7ece5f: am 46686c6f: Merge "Add prebuilt browseable samples as static files." into klp-dev
...
* commit '7c4a526b79b078a34d1268b63406025120cc043e':
Add prebuilt browseable samples as static files.
2014-01-09 21:35:28 +00:00
Andrew Hsieh
81c1a20189
am b970ec3f: am c8e78f48: am 522490da: am 55530bf3: Merge "ndk: Add missing declaration for mkdtemp"
...
* commit 'b970ec3fd1b68b62eae7a7a97b39cf844bfc279d':
ndk: Add missing declaration for mkdtemp
2014-01-09 21:35:27 +00:00
Andrew Hsieh
4db36d024d
am bb8f23a4: am 64b72116: am ba2adddb: am 3fd7d3d3: Merge "cleaned code, added pinch gesture detector, better opengl context handling, fixed issues"
...
* commit 'bb8f23a4aa80002c29ee3ddf1a4562aaed8d7d6d':
cleaned code, added pinch gesture detector, better opengl context handling, fixed issues
2014-01-09 21:35:25 +00:00
Adam Koch
f678de00bf
am e7681200: am 6c8f4d96: am 47e3f029: Bitmapfun Sample: Minor updates to match zip file in training class.
...
* commit 'e768120026cfc9330c54e5c95528dbc9ef60ea8d':
Bitmapfun Sample: Minor updates to match zip file in training class.
2014-01-09 21:35:23 +00:00
Ian Ni-Lewis
e79e1d42ac
am 00b7cabe: Merge "cleaned code, added pinch gesture detector, better opengl context handling, fixed issues"
...
* commit '00b7cabe8db161136a19f0222ffe8bab2433000b':
cleaned code, added pinch gesture detector, better opengl context handling, fixed issues
2014-01-09 21:35:20 +00:00
Elliott Hughes
1142d35b03
am 1a062a25: am 00d5277a: am 9c527023: am 122d194b: Merge "Fix incorrect extern declaration of poll(2)."
...
* commit '1a062a254f5d39502117d21c73d4a64a2dd037ae':
Fix incorrect extern declaration of poll(2).
2014-01-09 21:35:18 +00:00
Narayan Kamath
533a83f6b6
am e38dba60: am e53bc4d9: am 80b5d8d2: am b4f054a8: Merge "Remove invalid UTF-8 chars from source."
...
* commit 'e38dba6083bf3e6738c2a520eb404b78cd1a99e0':
Remove invalid UTF-8 chars from source.
2014-01-09 21:35:16 +00:00
Ben Murdoch
37a0f4ed66
am 489c3b6b: Merge "Add mips support to stack tool."
...
* commit '489c3b6b4c16d2c58a590168fa08893b96a8d37b':
Add mips support to stack tool.
2014-01-09 21:35:15 +00:00
Tor Norbye
499f96a5e3
am 98fd3b44: am 8c37790e: am 15a65401: Update the api-version.xml file to reflect KitKat recent changes
...
* commit '98fd3b4459e95900b51ccc46385b3936a8ccb948':
Update the api-version.xml file to reflect KitKat recent changes
2014-01-09 21:35:08 +00:00
Chet Haase
37c4ea4637
am a1a8337f: am f02d4487: am 9262e703: Merge "Fix ApiDemo for transitions" into klp-dev
...
* commit 'a1a8337f3a6cdffc73739137c27dc995a8fc15c7':
Fix ApiDemo for transitions
2014-01-09 21:35:07 +00:00
Adam Koch
94ebdc8faf
am b184cdd9: am fb159c79: am 7165109e: Bitmapfun Sample: Cleanup gradle files to import into Studio properly.
...
* commit 'b184cdd9397bee4ebe9d85825ea09c4766d05aac':
Bitmapfun Sample: Cleanup gradle files to import into Studio properly.
2014-01-09 21:35:01 +00:00
Chong Zhang
03beab7e95
am 9d0982d5: am 2e2085f4: am 2ec448a2: am 58ef2c38: am fd6d06a1: mrp sample: refactor and use helper class
...
* commit '9d0982d5aa965d063906f5701e84568b69c857dc':
mrp sample: refactor and use helper class
2014-01-09 21:34:59 +00:00
Jeff Brown
b133e0e632
am 65f5b5bb: am c683fb4c: am bb1f4a73: am 10f22587: am 6a81c4be: Fix NPE in sample code.
...
* commit '65f5b5bbda00dfb44b34f4caf6109e37d75ef70c':
Fix NPE in sample code.
2014-01-09 21:34:53 +00:00
Adam Koch
0ec39f3d80
am c352e57b: am 0d873095: am 933dd8a3: Merge "Bitmapfun Sample: Update for KitKat and clean up some minor bugs." into klp-dev
...
* commit 'c352e57b56321de7b565981235e7e57b506b48d4':
Bitmapfun Sample: Update for KitKat and clean up some minor bugs.
2014-01-09 21:34:52 +00:00
Adam Koch
f224cd4cc7
am ad76f956: am 107a3b94: am c246e4a8: Merge "Bitmapfun Sample: Migrate to Android Studio/gradle project." into klp-dev
...
* commit 'ad76f95624eadca35a19610a572dd20847532326':
Bitmapfun Sample: Migrate to Android Studio/gradle project.
2014-01-09 21:34:51 +00:00
Ben Cheng
b1d6d2e480
am f85cfcfe: am c888278c: am d4b49c6c: am 8edf8ef6: Merge "Refresh sysroot headers for aarch64."
...
* commit 'f85cfcfe559777264ab89016a3b7bb0c24acf65d':
Refresh sysroot headers for aarch64.
2014-01-09 21:34:50 +00:00
Tor Norbye
1163d57b5d
am 68370aef: am 03a66dd8: am 30278c6f: Merge "Update the api-version.xml file to reflect KitKat recent changes" into klp-dev
...
* commit '68370aefea5a0fccfdca6decfb3eb797244cc552':
Update the api-version.xml file to reflect KitKat recent changes
2014-01-09 21:34: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
d980848377
Fix typo in comments in looper.h
...
Remove android-13's looper.h because it's identical to android-9's
Note that ndk/platforms/android-N only keep delta to previous level
Change-Id: Ibd2c3e168cfe7f6902fdc6eca2e2778d8ccf1fac
2014-01-08 17:24:22 +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
Deepanshu Gupta
bc0b4a804f
Bundle Noto fonts with the SDK
...
Change-Id: I28c48b3b5dbd761ef0391497e834f315ac83cae4
2014-01-08 01:44:45 +00: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