Commit Graph

13993 Commits

Author SHA1 Message Date
Andrew Hsieh
a7b6dbe8c8 am ec01bd3b: am 400ac261: am be13dbd7: am de53375f: am f991c547: am 42bb3bca: Merge "Fix typo in comments in looper.h"
* commit 'ec01bd3bfb2739a93b2d99b4b05aac581d143ffe':
2014-05-13 15:17:51 +00:00
Andrew Hsieh
72a464f2a5 am a2ef514b: am 83bd985e: am 470ec2be: am 0423f030: am 28c9c34d: am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
* commit 'a2ef514b62a4035e08001413938e0ba03be64d25':
2014-05-13 15:17:50 +00:00
Santos Cordon
a34f5c6358 am 5c67ce0b: resolved conflicts for merge of 17bfc712 to master-nova-dev
* commit '5c67ce0ba19575ee8dc838a955f1889be8181330':
2014-05-13 15:17:48 +00:00
Santos Cordon
65b1fc2a89 am 70939ca3: Adding telecomm-unit alias for running telecomm tests with runtest.
* commit '70939ca364cc373c3f0bac4eb3638283738abc65':
  Adding telecomm-unit alias for running telecomm tests with runtest.
2014-05-13 15:17:43 +00:00
Andrew Hsieh
0b198ce651 am 66febb33: am 02f789fb: am bee62e6e: am 926d852a: am 1c9e7361: am 3517e742: Merge "Implement wait4 already exist in header"
* commit '66febb33474783e441facd674b75428b5eb73e82':
2014-05-13 15:17:42 +00:00
Xavier Ducrohet
d903f46291 am 3c92c20e: am 229a9f3d: am 054d7849: resolved conflicts for merge of 7d85d0a9 to master
* commit '3c92c20ed710855f8a83473603fd225578de9ffb':
2014-05-13 15:17:41 +00:00
Xavier Ducrohet
89ea63697d am 0c449f7f: am 817e252b: am 39c7e520: am 699fdf70: am c7e44de1: am cd171fd3: am 7f15ddd5: Properly package the RS support bc file.
* commit '0c449f7f5fd676af30767a230df67c1c083fed7a':
2014-05-13 15:17:40 +00:00
Andrew Hsieh
1eaecb88d7 am 0de6f4b2: am dcf33b9c: am 73524a91: am bc5de16b: am e89c4f7f: am 365e66fe: Merge "Fixed API18 math.h for clang3.4"
* commit '0de6f4b27f9577ec38659fcbfcc3d887ba32495b':
2014-05-13 15:17:39 +00:00
Andrew Hsieh
9da076f701 am a2f8dd55: am 62bc88bc: am 7967d358: am 1fd910a7: am cbe87010: am 29c857fe: Merge "Restore immersive mode when volume button has been pressed."
* commit 'a2f8dd55760d260d445260749d33a1c9b4c887bd':
2014-05-13 15:17:37 +00:00
Andrew Hsieh
046cdbd355 am 9bb60133: am acedfdee: am 8eff33c2: am 0862223e: am 412eed7a: am 13f2b7e1: Merge "Fix rendering issue in Tegra2/3."
* commit '9bb60133bef67a9a65bc8a2c6cc77e0fddf0df6a':
2014-05-13 15:17:36 +00:00
Andrew Hsieh
26bb481932 am 8e2944e0: am 10826fb2: am 5ed6ffdc: am 4ecd37d0: am 57ebb3aa: am 7c35de7f: Merge "Add support for building the NDK\'s native_app_glue."
* commit '8e2944e0a53c8bd4a2bd059756bef78e5bb6c655':
2014-05-13 15:17:35 +00:00
Andrew Hsieh
7ae8df961e am 1822cbc2: am d445647f: am 575bd012: am d9abded2: am 7a432f8c: am 11728ce9: Merge "Workaround the __builtin_isnan() type error for clang 3.4."
* commit '1822cbc2cc3ab86d0ff8e1f72529876c7b02ad7b':
2014-05-13 15:17:33 +00:00
Christopher Ferris
5a4d23727e am fa865696: am a6083378: am ad9fef85: am a8a66a4e: am 3356457a: am 9092f8fb: Merge "Use uapi kernel headers."
* commit 'fa865696d02a21c4798082f9c58541bf63ce444b':
2014-05-13 15:17:32 +00:00
Adam Powell
36b9c5c061 am a5c39b2b: am a094ce56: am d6ffb0ae: am 544a42f0: Example activity for RecyclerView
* commit 'a5c39b2beac3e827e98ccb24fcd686ee59059aec':
2014-05-13 15:17:31 +00:00
Tor Norbye
c50b359a6f am d4856d42: am ac65c5ac: am 09ace69a: Remove Nullable annotation
* commit 'd4856d426d6c32b7f88b835a96888b106cd3e607':
2014-05-13 15:17:30 +00:00
Andrew Hsieh
1fc1f08bfa am 29fb9a8c: am a95b29a1: am 0e502601: am 2ead849b: am 0c5907b3: am 2f5fa0be: Merge "ndk: Fix wait4() declarations"
* commit '29fb9a8c7fd935e9483ef5e9b8898669680dfaa5':
2014-05-13 15:17:29 +00:00
Narayan Kamath
ed27f4ef03 am 25063df2: am 7a3759d4: am 10e82353: am 7d3b1cc2: am 4ebf0371: am 1e18a584: Merge "Whitelist libziparchive for windows."
* commit '25063df21f076a418ce6acb8e7e6e3f6f1c251b0':
2014-05-13 15:17:27 +00:00
George Mount
0f668b4764 am 2bf9675a: am 9d675bc0: am 3dd963e5: Merge "Add Trim Path API demo."
* commit '2bf9675a7192e887620887482f854098d9e7eeff':
2014-05-13 15:17:26 +00:00
Qiwen Zhao
fc0f0efabc am 90953d44: (-s ours) am 0afedc06: am 21657766: am a924e71c: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
* commit '90953d440fb761def3a4e9f51026a0f7e0388a2c':
2014-05-13 15:17:25 +00:00
Qiwen Zhao
8ec7474b5c am a4bf00a4: (-s ours) am 98f5f30d: am a924e71c: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
* commit 'a4bf00a43a6f452e678ae5648e03791c458c7196':
2014-05-13 15:17:24 +00:00
Baligh Uddin
afbc535796 am 31f01160: am 7639f8d7: am 44c0b09b: Remove deprecated locales
* commit '31f0116010f94467ea71dbfd31f11c6d34963b9e':
2014-05-13 15:17:23 +00:00
Qiwen Zhao
df1e96fa41 am 91c93990: am 8a0d04b9: am 01bd07ca: (-s ours) am 5e84ff2c: (-s ours) snap to klp-dev-plus-aosp f57b1e0 with history
* commit '91c93990e8fd0636387558edd6c41a7555a4a341':
2014-05-13 15:17:21 +00:00
The Android Open Source Project
aa1dea322a am 32c419e5: am 9988001a: am f57b1e03: am e0f497fe: Merge commit \'54ec4ff7dfa9e8028f9da1986a73bddb1c00be93\' into HEAD
* commit '32c419e557f7b806c103a490eef9f2d4d3e65cbc':
2014-05-13 15:17:20 +00:00
Andrew Hsieh
a0c4eb0bd5 am cd85c62c: am a1127d76: am 8e938888: am a77377be: Merge "Annotate JNICALL with __NDK_FPABI__"
* commit 'cd85c62c020f79d9a5459fb6be6f0f2167b18012':
2014-05-13 15:17:19 +00:00
Andrew Hsieh
fc2897a1bd am 54d687de: am 2b544b12: am d43cf5c8: (-s ours) am a79d5399: am fa73c847: am 54723fb6: Merge "Remove missing functions imaxabs() and imaxdiv() from inttypes.h"
* commit '54d687de9bbf63a672e98f2b9ce0678a598d203d':
2014-05-13 15:17:18 +00:00
Dianne Hackborn
1c41ffb0e8 am 0568039d: am 49ead054: am 1437d2c3: am 59e6f5d9: am 18159037: Add API demo for game style system UI interaction.
* commit '0568039d7b640ae914dec5d72c8d23d16464fd9d':
2014-05-13 15:17:17 +00:00
Andrew Hsieh
2ef62f01fd am 355ba9be: am ccf9e0c6: am 3ee7860e: am 9e09a8e8: Merge "Fix -mhard-float for calling __builtin_* math functions"
* commit '355ba9beff4184c1d74e1561e0b040bb18a035b3':
2014-05-13 15:17:15 +00:00
Raphael Moll
939b226f71 am 7501a975: am cfed45de: am 51fa6c5c: am aa198e6c: am 3519ce6e: Adjust SDK revisions for KLP MR1 for platform and samples
* commit '7501a975062fc12cb3e67db61641cb81a6841236':
2014-05-13 15:17:14 +00:00
Andrew Hsieh
c36a0b9276 am 56d673c3: am 7582b31a: am eb9388bc: am d9c17aa7: Merge "Enhance hello-jni to report APP_ABI at compilation"
* commit '56d673c388f478e3d4d381dd3ec3b50e3d2b8b47':
2014-05-13 15:17:13 +00:00
Raphael Moll
5a5c382a4e am 42070064: am 65bde24c: am 90157f82: am f7624c5a: am c04b7aad: SDK Repository: switch to sdk addon revision 6.
* commit '42070064b97b91edb946ce29427fa88868c8ee6b':
2014-05-13 15:17:12 +00:00
Katie McCormick
ac01cdd854 am 4d59e66f: am 338417d1: am 4afb47eb: am b652393d: am b3017f4d: Sample code: bug fix
* commit '4d59e66f4f3bbeab7ebfa109d31d1c50487a5010':
2014-05-13 15:17:11 +00:00
Xavier Ducrohet
ebfeeb616c am 7757a5fa: (-s ours) am 63837433: am c5686e15: (-s ours) am 2472128a: am 888bd6a1: Merge "Prepare SDK for KLP MR1. Do not merge." into klp-dev
* commit '7757a5fa2ba689551b9c5312c8f19c5db06fd77d':
2014-05-13 15:17:09 +00:00
Ben Cheng
30c085b272 am 0a3b687d: am 3332adb7: am e8ce7584: am 18e10d81: am 4a09318c: Merge "Temporarily disable elftree on darwin-x86"
* commit '0a3b687dff876f10fa81f65dee9b405e57f8e201':
2014-05-13 15:17:08 +00:00
The Android Open Source Project
1752a8c0e3 am f2abeba3: am bcc10931: am 5168cbad: am c61dbe23: Merge commit \'8eccbd3b5d90b9f0557c9a01f49d45e98ac85a46\' into HEAD
* commit 'f2abeba3d914a8db739b70f7dba5034e57354884':
2014-05-13 15:17:07 +00:00
Kenny Root
8e9fff2c1b am 9af43732: am 5cd6376a: am a163fa90: am 7e0d5c29: am c9421a7a: Merge "make_key: add EC key generation support"
* commit '9af437320b93ecb938bc8484f79ab99c5758eaac':
2014-05-13 15:17:06 +00:00
Alexander Lucas
44ce1c5d5d am 0c1c0fbb: am 5a0ab971: am b40c1571: am 3a85c6d5: am 98a13468: Updating samples browser to include ActionBarCompat samples
* commit '0c1c0fbb530bd1feef826ded371b7aaf14a1bee1':
2014-05-13 15:17:05 +00:00
Ben Cheng
64f0da2d90 am 8fbafca9: am ad593476: am 23604216: am 45d19989: am 4b60b014: Merge "Switch to use elfutils 0.153"
* commit '8fbafca9f144687ad89ef95d4131da274ff23a35':
2014-05-13 15:17:03 +00:00
Andrew Hsieh
d8289c0d63 am 26d32319: am 79b01661: am 6763bf82: am 3053834f: am c044b5e3: Merge "- Using hard-fp - Immersive mode in android-19 - Fixed local reference release in JNI helper - Misc fixes Change-Id: I3ab19c2b66648bb7a011c462d9d98e75bc136ce6"
* commit '26d323195bb97a087ba9812c475fb99874838f6d':
2014-05-13 15:17:02 +00:00
Elliott Hughes
a2532a9f86 am ba5eec06: am 5bb6cf6e: am 03e0781e: am f067a933: am 1f1e7379: Merge "MIPS hasn\'t supported SA_RESTORER since 2.5 kernels."
* commit 'ba5eec0601dbbaf04064eefa16b45ab8884c8e90':
2014-05-13 15:17:01 +00:00
Alexander Lucas
43530adea4 am 77da8dbc: am a4571dc3: am 607b0da6: am f044ac48: am b734f1b5: Updating sdk.atree to reflect new set of samples
* commit '77da8dbc9306bfbd7018abe0601ae8c3daa87096':
2014-05-13 15:17:00 +00:00
Tor Norbye
583b427afa am 1c99b5a3: am 9eb0faea: am d5f35e29: am 02ab4c2b: am dff82828: Update api-versions.xml for latest API changes
* commit '1c99b5a3f48c126cf588f3e8a89a6210f3f1849e':
2014-05-13 15:16:59 +00:00
Mindy Pereira
a9dd74a3fa am 0c0fe6f7: am 8ca83ba6: am 279ed15a: am fd2db1be: Merge "Swiperefresh sample" into klp-ub-dev
* commit '0c0fe6f7c33b28eb333d5dcaf8fe93bf4c9f30a8':
2014-05-13 15:16:58 +00:00
Joe Fernandez
75cb9ae634 am 22dfabd6: am a7e2ef83: am 54ec4ff7: am becd685b: am 4233252a: Sample code for OpenGL Android training class
* commit '22dfabd6ae29dd1f2f4d6a1328c9c0bf3dc4fbd3':
2014-05-13 15:16:56 +00:00
Andrew Hsieh
3df5474242 am 0ddf7b0c: am e505d798: am 1785c989: am 7956dc3c: am faab12a0: Merge "Update time.h for CLOCK_BOOTTIME, etc"
* commit '0ddf7b0c5090ccff8c6405d885333ee89fd95d45':
2014-05-13 15:16:55 +00:00
Andrew Hsieh
798dedf418 am f4fae607: am 1b5df5cb: am 1badc519: am a60db2e7: am 69139a5a: Merge "Added missing clock_settime()/clock_nanosleep() in time.h API>=8"
* commit 'f4fae60750c4d845e133afaba8075989414eeb6f':
2014-05-13 15:16:54 +00:00
Jeff Sharkey
51bfe101ec am 5dcb36d4: am eabf753f: am f652b217: am f7ca56e8: am b4b28f87: Only enable VaultProvider on KitKat devices.
* commit '5dcb36d4302a66249e837e5a43ee7879e548ca19':
2014-05-13 15:16:53 +00:00
Yohann Roussel
aede7f40ca am f91d20cb: am a7e22f47: Merge "Move multidex support library"
* commit 'f91d20cb3f725ca0bb9bce78923a643e663ca622':
2014-05-13 15:16:51 +00:00
Jeff Sharkey
c147240399 am 58737360: am 3cb41832: am f191627b: am 39b80a76: am c21b79e2: Fix build breakage.
* commit '587373601ab7fa6ad5e50d1ce5a605b7c80dce37':
2014-05-13 15:16:50 +00:00
Jeff Sharkey
54dce6c386 am 29c3b907: am dc952dcb: am fe06414a: am b09a66d2: am 93de4115: Vault example documents provider.
* commit '29c3b907a932bf107acd534a1746fbeb470036ab':
2014-05-13 15:16:49 +00:00
Andrew Hsieh
d4d34eb236 am 0d803d25: am 34844588: am 2e544101: am 41ae572f: am aaebba0e: Merge "Add utimensat and futimens to libc.so at API level 12 and 19, respectively"
* commit '0d803d25475fa3d698648c148f953338659877fa':
2014-05-13 15:16:47 +00:00