Commit Graph

14153 Commits

Author SHA1 Message Date
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
Dirk Dougherty
48a753b17b am 9425d824: am d036ed77: am 6d63d11e: am cc1867bc: Fix broken javadoc reference.
* commit '9425d824792974736108eb6353fe744637c2011f':
2014-05-13 15:16:18 +00:00
quddusc
80aded0809 am d444749e: am 727ff57f: am 0b448c3b: am 11d2eef3: Updated browsable sample descriptions.
* commit 'd444749e3b9c1fba2fbd4a0cb560cbf558240dc1':
2014-05-13 15:16:16 +00:00
quddusc
9caed2a83e am 3a71cc19: am d2b26f74: am a969fb4b: am a76387f7: Updated description for the StorageProvider browseable sample.
* commit '3a71cc19ed56c4452136681d6b2b06145d176a93':
2014-05-13 15:16:15 +00:00
Dirk Dougherty
789fb84864 am eb07ea95: am 7f725ffd: am 7656c163: am 2a7b416b: Merge "Add StorageProvider sample code to browseables." into klp-dev
* commit 'eb07ea9541ec177fe3c8f2be2f5e8f2c9a50ca60':
2014-05-13 15:16:14 +00:00
Svetoslav Ganov
9a35f85892 am 87625caa: am d89fa640: am a12747bc: am 7c833d71: Merge "Update the print from off-screen WebView sample" into klp-dev
* commit '87625caa5e015f480ffc7ab355ef91f43e49f04a':
2014-05-13 15:16:12 +00:00
Adam Koch
fcce85ed31 am de34fbab: am 4544562a: am 70f9c934: am ddba6b87: Merge "KitKat SMS APIs DevByte Sample Code" into klp-dev
* commit 'de34fbabb389bee347b2ee8317ac2290cfec5985':
2014-05-13 15:16:11 +00:00
Svetoslav Ganov
4c2672a3b0 am 218f323d: am f9c86a50: am c100e53e: am 79efac6b: Merge "Add print samples to the ApiDemos app." into klp-dev
* commit '218f323d8abb75096f09f707571b234163739986':
2014-05-13 15:16:10 +00:00
Dirk Dougherty
e130a24853 am 74f434e5: am 2b39eabe: am c1ef60a2: am 1c254de3: Merge "Add kk to redirects file." into klp-dev
* commit '74f434e51c493612afa6d1c4a349455edab1a54d':
2014-05-13 15:16:09 +00:00
Roman Nurik
be169d6096 am c21b6568: am 3a0a7d6a: am 68558338: am 3b6fb5c0: Merge "Add Android 4.4 Immersive Mode DevByte sample code." into klp-dev
* commit 'c21b6568628a9cb1c22f51acc813b8c4e7885de9':
2014-05-13 15:16:07 +00:00
Svetoslav
c0ca6a7cf7 am 6c58de49: am 659b59ab: am 22af8556: am 40bea547: Merge "Adding an API demo for how to implement printing in an app." into klp-dev
* commit '6c58de49c715d7c573ce312fb4321cff2e7a2f3d':
2014-05-13 15:16:05 +00:00
Dirk Dougherty
c74d80c3c5 am 894c3d95: am 7c4a526b: am dc7ece5f: am 46686c6f: Merge "Add prebuilt browseable samples as static files." into klp-dev
* commit '894c3d9560372768e7eab8856c035f367582a4b9':
2014-05-13 15:16:04 +00:00
Andrew Hsieh
cbaddaae77 am 81c1a201: am b970ec3f: am c8e78f48: am 522490da: am 55530bf3: Merge "ndk: Add missing declaration for mkdtemp"
* commit '81c1a20189f88d7a4d40a7e7f98d5b18c667d48a':
2014-05-13 15:16:02 +00:00
Andrew Hsieh
60ddcf2e1b am 4db36d02: am bb8f23a4: am 64b72116: am ba2adddb: am 3fd7d3d3: Merge "cleaned code, added pinch gesture detector, better opengl context handling, fixed issues"
* commit '4db36d024d39dbe9cad0a6c73ffeb4ce2a48420f':
2014-05-13 15:16:00 +00:00
Adam Koch
1f7f32c1b9 am f678de00: am e7681200: am 6c8f4d96: am 47e3f029: Bitmapfun Sample: Minor updates to match zip file in training class.
* commit 'f678de00bf7bd5c94ef59b5155c45380ca525241':
2014-05-13 15:15:58 +00:00
Ian Ni-Lewis
b0ccced623 am e79e1d42: am 00b7cabe: Merge "cleaned code, added pinch gesture detector, better opengl context handling, fixed issues"
* commit 'e79e1d42ac7be5e64d2d3265bbb3d8f31a614a2c':
2014-05-13 15:15:54 +00:00
Elliott Hughes
8ce5393ee7 am 1142d35b: am 1a062a25: am 00d5277a: am 9c527023: am 122d194b: Merge "Fix incorrect extern declaration of poll(2)."
* commit '1142d35b032a077d58edb629571513acacadaff0':
2014-05-13 15:15:51 +00:00
Narayan Kamath
408d183c96 am 533a83f6: am e38dba60: am e53bc4d9: am 80b5d8d2: am b4f054a8: Merge "Remove invalid UTF-8 chars from source."
* commit '533a83f6b6e76e8c3cc2c3e11bac1d3631ff7d47':
2014-05-13 15:15:48 +00:00
Ben Murdoch
1072747ce0 am 37a0f4ed: am 489c3b6b: Merge "Add mips support to stack tool."
* commit '37a0f4ed6616f92b1be7ecc906bb1c8b13e7dbe4':
2014-05-13 15:15:47 +00:00
Tor Norbye
779381999c am 499f96a5: am 98fd3b44: am 8c37790e: am 15a65401: Update the api-version.xml file to reflect KitKat recent changes
* commit '499f96a5e3a5085f6c62a85733cd2e5e800fff33':
2014-05-13 15:15:46 +00:00