Commit Graph

13928 Commits

Author SHA1 Message Date
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
Adam Koch
7ffced20de am 0b54845a: am 07191356: am a36818f4: am 0c9bfb30: am 8180be14: Bitmapfun Sample: Minor updates/fixes.
* commit '0b54845a00d7e193544a1959601e77acdaf6e409':
2014-05-13 15:16:46 +00:00
Yuhao Zheng
bcbafca976 am 29f88c6f: am 55d16466: Merge "Fix UI of testing TDLS in Dev Tools app"
* commit '29f88c6f4ca049e76145c486a36c3c8ea8c95885':
2014-05-13 15:16:44 +00:00
Chong Zhang
f65d3cdb2d am 58ee3fed: am 69805de2: am 83270583: am 469e5a18: am 4e5bae34: am 9678ee60: am c1eb2306: Add sample code to customize the MediaRouteControllerDialog
* commit '58ee3fedbb58f58079caea3e80ae2f6aea1f1683':
2014-05-13 15:16:43 +00:00
Dirk Dougherty
f043511086 am 89517bdc: am a90de8d3: am b13d5c19: am 886fe002: am a0b7965b: Add updated StorageProvider sample, merge _index with existing file.
* commit '89517bdc409052f3af7e9453346d818692321775':
2014-05-13 15:16:42 +00:00
Scott Main
f6357905fa am f6e5dd3e: am b6a83cef: am 16560f1e: resolved conflicts for merge of fae59e8a to klp-dev-plus-aosp
* commit 'f6e5dd3eee8a5d2d15aa77f125a61784ae7d474c':
2014-05-13 15:16:40 +00:00
Dirk Dougherty
99a9f57e60 am aec7112c: am a870f691: am b4a60146: resolved conflicts for merge of d7f2d1ca to klp-dev-plus-aosp
* commit 'aec7112c40b462ade3cfe8433f450cb5e2a7a79b':
2014-05-13 15:16:39 +00:00
Dirk Dougherty
d439c69e25 am 5511f633: am eb0d7851: am 18dbb0a5: am a2a5de35: resolved conflicts for merge of 3ef2b0f3 to klp-ub-dev
* commit '5511f633174632b277d679c8674516e0fabb397f':
2014-05-13 15:16:38 +00:00
quddusc
407b9d6a6d am 16d95714: am 6838eb1a: am 7e3fa615: am 4e4303c9: (-s ours) resolved conflicts for merge of 3943cdc9 to klp-ub-dev
* commit '16d9571455b03df539313387ec9c96ff4c786753':
2014-05-13 15:16:36 +00:00
Andrew Hsieh
f1fd967ec0 am 2d4790be: am 952d826d: am ff6257f1: am 09b09c99: am d0b6889f: Merge "<pthread.h>: Mark pthread_exit() as __noreturn"
* commit '2d4790beee1d1c6ae34c052548bfbd0f7d2d1997':
2014-05-13 15:16:35 +00:00
Andrew Hsieh
4e29aeb9ef am 42c43b9b: am 483cc1ec: am fba56b8d: am 3cdd51bb: am db524879: Merge "Remove obsolete ndk/platforms/android-9/arch-x86/src/__dso_handle*.S"
* commit '42c43b9b0d2858a0baf445944a384783467d24f7':
2014-05-13 15:16:34 +00:00
Andrew Hsieh
46a1f61afc am 2e972756: am c1f650fd: am 5c729736: am 361cba62: am ba780a0e: Merge "Refresh API19 include/android/* to android-4.4_r1"
* commit '2e97275699976377686abc4f0074807e702820c4':
2014-05-13 15:16:33 +00:00
Andrew Hsieh
0593ac6621 am d74da726: am c62d8616: am 848d28be: am c4ca079b: am c58abb6a: Merge "Rename modules NativeActivity"
* commit 'd74da726075db18f2722f1b8f5a9b9b8378b7d32':
2014-05-13 15:16:32 +00:00
Andrew Hsieh
ac4b1e1b62 am 6337adee: am 7937a30d: am 80f34090: am 6379074e: am 0aff4314: Merge "Addressed feedbacks - Now they are in ndkHelper:: name space - Changed module name to ndk_helper - Changed some static members to class var or stand alone function - Added syncronization for JNIHe
* commit '6337adee0e41ed4c7a3fe0916f1e00e4e2bfbf8e':
2014-05-13 15:16:30 +00:00
Dirk Dougherty
405ed9a651 am 8cb223b5: am d142dc87: am 43ce6bb3: am 99acac3a: Add updated StorageProvider sample, merge _index with existing file.
* commit '8cb223b57a72be4666c145973e307c6f718c0c28':
2014-05-13 15:16:29 +00:00
Scott Main
31bc739bfe am f04962a3: am 6a737d7a: am cde244d0: am 1d38e9a1: Merge "Updated description for the StorageProvider browseable sample." into klp-docs
* commit 'f04962a3ca4c782567d509eb50ed76a2e042da87':
2014-05-13 15:16:28 +00:00
quddusc
1690a458a2 am 0df29175: am 7ed813af: am fa2f9d89: Merge "Merge commit \'177a5df9\' into manualmerge2" into klp-dev-plus-aosp
* commit '0df291756efab4d01a1bf4769613ca96cb9cea68':
2014-05-13 15:16:27 +00:00
Andrew Hsieh
14db2c5a08 am 8e23fbbd: am 23b163fd: am e3a07da0: am 9dabc24f: am 4abacac3: Merge "Fix prototype of poll"
* commit '8e23fbbdab8cfea15a4acd8cbf7fa43a558cf48a':
2014-05-13 15:16:25 +00:00
Dirk Dougherty
1dce01c7ac am 026c4675: am 5969d205: am 5e90c148: Merge commit \'2397b75d\' into manualmerge
* commit '026c4675396e75f7b56cf2db09d9e32f9f75325e':
2014-05-13 15:16:24 +00:00
Dirk Dougherty
3c9ab5e864 am da70c955: am 35da2acf: am 9b903167: am 3ef2b0f3: Add StorageProvider sample code to browseables.
* commit 'da70c95553f1375c8400ab91d6a814d1bafba901':
2014-05-13 15:16:23 +00:00
quddusc
aca26aa6fc am a585c22b: am 0f2ebe84: am 60737e95: Merge commit \'3943cdc9\' into manualmerge2
* commit 'a585c22baf21c3714dac7a5b2e65bb186e657a80':
2014-05-13 15:16:22 +00:00
Elliott Hughes
f02674c53b am 9d0e2ca0: am 356cdcbd: am f99585bd: am ff11bce0: am 07bdc2b8: Merge "Fix build."
* commit '9d0e2ca0198a2a0b81148d9e4cdba2127f4e2b53':
2014-05-13 15:16:21 +00:00
quddusc
ef4fb79bbf am c851feed: am 433830c0: am 213a31d7: am b5de8afa: Fixed broken link in ActivityInstrumentation sample description.
* commit 'c851feedfb1621733fe05952c61f1596a0e05e2d':
2014-05-13 15:16:19 +00:00