Xavier Ducrohet
7757a5fa2b
am 63837433: am c5686e15: (-s ours) am 2472128a: am 888bd6a1: Merge "Prepare SDK for KLP MR1. Do not merge." into klp-dev
...
* commit '63837433aef04baeb2d02dd127ecfcfd30630762':
Prepare SDK for KLP MR1. Do not merge.
2014-01-09 21:36:36 +00:00
Ben Cheng
0a3b687dff
am 3332adb7: am e8ce7584: am 18e10d81: am 4a09318c: Merge "Temporarily disable elftree on darwin-x86"
...
* commit '3332adb785830211adbf2af44bc7b6bff724949b':
Temporarily disable elftree on darwin-x86
2014-01-09 21:36:34 +00:00
The Android Open Source Project
f2abeba3d9
am bcc10931: am 5168cbad: am c61dbe23: Merge commit \'8eccbd3b5d90b9f0557c9a01f49d45e98ac85a46\' into HEAD
...
* commit 'bcc1093127700df75779667ebf10707df1dbceed':
2014-01-09 21:36:33 +00:00
Kenny Root
9af437320b
am 5cd6376a: am a163fa90: am 7e0d5c29: am c9421a7a: Merge "make_key: add EC key generation support"
...
* commit '5cd6376aed4d2bb3e2cf86126dee4778b136d7f8':
make_key: add EC key generation support
2014-01-09 21:36:32 +00:00
Alexander Lucas
0c1c0fbb53
am 5a0ab971: am b40c1571: am 3a85c6d5: am 98a13468: Updating samples browser to include ActionBarCompat samples
...
* commit '5a0ab97113b36574fe2492121029db53c8cde9eb':
Updating samples browser to include ActionBarCompat samples
2014-01-09 21:36:31 +00:00
Ben Cheng
8fbafca9f1
am ad593476: am 23604216: am 45d19989: am 4b60b014: Merge "Switch to use elfutils 0.153"
...
* commit 'ad593476a8674ff86d85512eab1c98828be2313b':
Switch to use elfutils 0.153
2014-01-09 21:36:30 +00:00
Andrew Hsieh
26d323195b
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 '79b016614d60fb39023a8fb1467b64d78935a272':
- Using hard-fp - Immersive mode in android-19 - Fixed local reference release in JNI helper - Misc fixes Change-Id: I3ab19c2b66648bb7a011c462d9d98e75bc136ce6
2014-01-09 21:36:29 +00:00
Elliott Hughes
ba5eec0601
am 5bb6cf6e: am 03e0781e: am f067a933: am 1f1e7379: Merge "MIPS hasn\'t supported SA_RESTORER since 2.5 kernels."
...
* commit '5bb6cf6e07bd4d806bcdf073ccad73d87d7e7f00':
MIPS hasn't supported SA_RESTORER since 2.5 kernels.
2014-01-09 21:36:28 +00:00
Alexander Lucas
77da8dbc93
am a4571dc3: am 607b0da6: am f044ac48: am b734f1b5: Updating sdk.atree to reflect new set of samples
...
* commit 'a4571dc35148b03ec65e2d5f1e49ee0bece85898':
Updating sdk.atree to reflect new set of samples
2014-01-09 21:36:27 +00:00
Tor Norbye
1c99b5a3f4
am 9eb0faea: am d5f35e29: am 02ab4c2b: am dff82828: Update api-versions.xml for latest API changes
...
* commit '9eb0faeae843290b1c0df39ee8e7a8e6b1be3b9f':
Update api-versions.xml for latest API changes
2014-01-09 21:36:25 +00:00
Mindy Pereira
0c0fe6f7c3
am 8ca83ba6: am 279ed15a: am fd2db1be: Merge "Swiperefresh sample" into klp-ub-dev
...
* commit '8ca83ba6d383f4d7fcd3c3c5a06d87ef4f16252d':
Swiperefresh sample
2014-01-09 21:36:24 +00:00
Joe Fernandez
22dfabd6ae
am a7e2ef83: am 54ec4ff7: am becd685b: am 4233252a: Sample code for OpenGL Android training class
...
* commit 'a7e2ef83dad1db44dd029cf57e16161e4e5d83ce':
Sample code for OpenGL Android training class
2014-01-09 21:36:23 +00:00
Andrew Hsieh
0ddf7b0c50
am e505d798: am 1785c989: am 7956dc3c: am faab12a0: Merge "Update time.h for CLOCK_BOOTTIME, etc"
...
* commit 'e505d7989a5d903fac1be7be4dc6aa044f097e47':
Update time.h for CLOCK_BOOTTIME, etc
2014-01-09 21:36:22 +00:00
Andrew Hsieh
f4fae60750
am 1b5df5cb: am 1badc519: am a60db2e7: am 69139a5a: Merge "Added missing clock_settime()/clock_nanosleep() in time.h API>=8"
...
* commit '1b5df5cb9476c6e9797f759619d9839640507793':
Added missing clock_settime()/clock_nanosleep() in time.h API>=8
2014-01-09 21:36:20 +00:00
Jeff Sharkey
5dcb36d430
am eabf753f: am f652b217: am f7ca56e8: am b4b28f87: Only enable VaultProvider on KitKat devices.
...
* commit 'eabf753ff63fa1098a0fb354c0acf800b980cfbc':
Only enable VaultProvider on KitKat devices.
2014-01-09 21:36:19 +00:00
Yohann Roussel
f91d20cb3f
am a7e22f47: Merge "Move multidex support library"
...
* commit 'a7e22f47af38aa4096381c4f4043d8124e2ac205':
Move multidex support library
2014-01-09 21:36:18 +00:00
Jeff Sharkey
587373601a
am 3cb41832: am f191627b: am 39b80a76: am c21b79e2: Fix build breakage.
...
* commit '3cb41832c384f00c1efbc4943e0479d5921a0d68':
Fix build breakage.
2014-01-09 21:36:17 +00:00
Jeff Sharkey
29c3b907a9
am dc952dcb: am fe06414a: am b09a66d2: am 93de4115: Vault example documents provider.
...
* commit 'dc952dcb4d0e1ca878caa3954393aa4fa6084159':
Vault example documents provider.
2014-01-09 21:36:16 +00:00
Andrew Hsieh
0d803d2547
am 34844588: am 2e544101: am 41ae572f: am aaebba0e: Merge "Add utimensat and futimens to libc.so at API level 12 and 19, respectively"
...
* commit '348445884a90afdb0779c7d91f36b463dfbcc0c6':
Add utimensat and futimens to libc.so at API level 12 and 19, respectively
2014-01-09 21:36:15 +00:00
Adam Koch
0b54845a00
am 07191356: am a36818f4: am 0c9bfb30: am 8180be14: Bitmapfun Sample: Minor updates/fixes.
...
* commit '071913567ccbce44565c8cf65c3b18276a2757c7':
Bitmapfun Sample: Minor updates/fixes.
2014-01-09 21:36:14 +00:00
Yuhao Zheng
29f88c6f4c
am 55d16466: Merge "Fix UI of testing TDLS in Dev Tools app"
...
* commit '55d16466f60bcb7aac3cd345f54f6c8ff33ecadd':
Fix UI of testing TDLS in Dev Tools app
2014-01-09 21:36:12 +00:00
Chong Zhang
58ee3fedbb
am 69805de2: am 83270583: am 469e5a18: am 4e5bae34: am 9678ee60: am c1eb2306: Add sample code to customize the MediaRouteControllerDialog
...
* commit '69805de2c4fa4a2a6615225c938132ce8bb89810':
Add sample code to customize the MediaRouteControllerDialog
2014-01-09 21:36:11 +00:00
Dirk Dougherty
89517bdc40
am a90de8d3: am b13d5c19: am 886fe002: am a0b7965b: Add updated StorageProvider sample, merge _index with existing file.
...
* commit 'a90de8d3c9171cf0b2339b556610aa3b37ccdaf7':
Add updated StorageProvider sample, merge _index with existing file.
redirect web overview page to index.html
2014-01-09 21:36:10 +00:00
Scott Main
f6e5dd3eee
am b6a83cef: am 16560f1e: resolved conflicts for merge of fae59e8a to klp-dev-plus-aosp
...
* commit 'b6a83cef3dde89c0617d9395368dce48e582497e':
2014-01-09 21:36:09 +00:00
Dirk Dougherty
aec7112c40
am a870f691: am b4a60146: resolved conflicts for merge of d7f2d1ca to klp-dev-plus-aosp
...
* commit 'a870f691abc3cd6348cec08b457448f2c38391f2':
2014-01-09 21:36:08 +00:00
Dirk Dougherty
5511f63317
am eb0d7851: am 18dbb0a5: am a2a5de35: resolved conflicts for merge of 3ef2b0f3 to klp-ub-dev
...
* commit 'eb0d7851a7ac6d4346d621e61208393bdc11e100':
2014-01-09 21:36:07 +00:00
quddusc
16d9571455
am 6838eb1a: am 7e3fa615: am 4e4303c9: (-s ours) resolved conflicts for merge of 3943cdc9 to klp-ub-dev
...
* commit '6838eb1a7714d266b60d4779229882a42853705b':
2014-01-09 21:36:05 +00:00
Andrew Hsieh
2d4790beee
am 952d826d: am ff6257f1: am 09b09c99: am d0b6889f: Merge "<pthread.h>: Mark pthread_exit() as __noreturn"
...
* commit '952d826ddd8731e8be71d37663d013c4166e4467':
<pthread.h>: Mark pthread_exit() as __noreturn
2014-01-09 21:36:04 +00:00
Andrew Hsieh
42c43b9b0d
am 483cc1ec: am fba56b8d: am 3cdd51bb: am db524879: Merge "Remove obsolete ndk/platforms/android-9/arch-x86/src/__dso_handle*.S"
...
* commit '483cc1ec0f6123a4ad0e869ff464d8779c6faa1c':
Remove obsolete ndk/platforms/android-9/arch-x86/src/__dso_handle*.S
2014-01-09 21:36:03 +00:00
Andrew Hsieh
2e97275699
am c1f650fd: am 5c729736: am 361cba62: am ba780a0e: Merge "Refresh API19 include/android/* to android-4.4_r1"
...
* commit 'c1f650fd87bb351a2e6365594a02cdad7023e16e':
Refresh API19 include/android/* to android-4.4_r1
2014-01-09 21:36:02 +00:00
Andrew Hsieh
d74da72607
am c62d8616: am 848d28be: am c4ca079b: am c58abb6a: Merge "Rename modules NativeActivity"
...
* commit 'c62d8616449afe8d4e1a38b1df8de8b0ff2ab9d5':
Rename modules NativeActivity
2014-01-09 21:36:01 +00:00
Andrew Hsieh
6337adee0e
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 JNIHelper.cpp - Fo
...
* commit '7937a30d38388ab74b9cc37214641980993cfbf0':
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 JNIHelper.cpp - For a documentation, I will work with doc writer for future improvement
2014-01-09 21:36:00 +00:00
Dirk Dougherty
8cb223b57a
am d142dc87: am 43ce6bb3: am 99acac3a: Add updated StorageProvider sample, merge _index with existing file.
...
* commit 'd142dc87c18a1c744dfaa2a650ded0294c02794f':
Add updated StorageProvider sample, merge _index with existing file.
2014-01-09 21:35:58 +00:00
Scott Main
f04962a3ca
am 6a737d7a: am cde244d0: am 1d38e9a1: Merge "Updated description for the StorageProvider browseable sample." into klp-docs
...
* commit '6a737d7a3242b2d2ae03a6e04dc2c043367d7ecf':
Updated description for the StorageProvider browseable sample.
2014-01-09 21:35:57 +00:00
quddusc
0df291756e
am 7ed813af: am fa2f9d89: Merge "Merge commit \'177a5df9\' into manualmerge2" into klp-dev-plus-aosp
...
* commit '7ed813af226521b17c93e3341b6133d400ea0172':
Fixed broken link in ActivityInstrumentation sample description.
2014-01-09 21:35:53 +00:00
Andrew Hsieh
8e23fbbdab
am 23b163fd: am e3a07da0: am 9dabc24f: am 4abacac3: Merge "Fix prototype of poll"
...
* commit '23b163fdd8c6c7048c8ea57de717f6b551562a8e':
Fix prototype of poll
2014-01-09 21:35:52 +00:00
Dirk Dougherty
026c467539
am 5969d205: am 5e90c148: Merge commit \'2397b75d\' into manualmerge
...
* commit '5969d205e6f6390e868ac7d6bbe4173242e051cf':
Fix broken javadoc reference.
2014-01-09 21:35:51 +00:00
Dirk Dougherty
da70c95553
am 35da2acf: am 9b903167: am 3ef2b0f3: Add StorageProvider sample code to browseables.
...
* commit '35da2acf9cf60bb35c502a42798153f9b511d0a4':
Add StorageProvider sample code to browseables.
2014-01-09 21:35:50 +00:00
quddusc
a585c22baf
am 0f2ebe84: am 60737e95: Merge commit \'3943cdc9\' into manualmerge2
...
* commit '0f2ebe84dab06b23100719383a051d2d36b0e6c0':
Updated browsable sample descriptions.
2014-01-09 21:35:49 +00:00
Elliott Hughes
9d0e2ca019
am 356cdcbd: am f99585bd: am ff11bce0: am 07bdc2b8: Merge "Fix build."
...
* commit '356cdcbd2771a82f8a927767532ba3b24152d333':
Fix build.
2014-01-09 21:35:47 +00:00
quddusc
c851feedfb
am 433830c0: am 213a31d7: am b5de8afa: Fixed broken link in ActivityInstrumentation sample description.
...
* commit '433830c039e501342062c8fa4868ffbaaf602c23':
Fixed broken link in ActivityInstrumentation sample description.
2014-01-09 21:35:46 +00:00
Dirk Dougherty
9425d82479
am d036ed77: am 6d63d11e: am cc1867bc: Fix broken javadoc reference.
...
* commit 'd036ed771d48819f711707d87757170ceaf77be7':
Fix broken javadoc reference.
2014-01-09 21:35:45 +00:00
quddusc
d444749e3b
am 727ff57f: am 0b448c3b: am 11d2eef3: Updated browsable sample descriptions.
...
* commit '727ff57f4abdeac6794fd16b79e0382bdff1d68b':
Updated browsable sample descriptions.
2014-01-09 21:35:44 +00:00
quddusc
3a71cc19ed
am d2b26f74: am a969fb4b: am a76387f7: Updated description for the StorageProvider browseable sample.
...
* commit 'd2b26f74de1b136b29bca0e2025a4d6583a5ef39':
Updated description for the StorageProvider browseable sample.
2014-01-09 21:35:43 +00:00
Dirk Dougherty
eb07ea9541
am 7f725ffd: am 7656c163: am 2a7b416b: Merge "Add StorageProvider sample code to browseables." into klp-dev
...
* commit '7f725ffdaeb17ad09fe6400f6648539b331d3f24':
Add StorageProvider sample code to browseables.
2014-01-09 21:35:42 +00:00
Svetoslav Ganov
87625caa5e
am d89fa640: am a12747bc: am 7c833d71: Merge "Update the print from off-screen WebView sample" into klp-dev
...
* commit 'd89fa640d0cd40f875ac2262520793dc362c5552':
Update the print from off-screen WebView sample
2014-01-09 21:35:41 +00:00
Adam Koch
de34fbabb3
am 4544562a: am 70f9c934: am ddba6b87: Merge "KitKat SMS APIs DevByte Sample Code" into klp-dev
...
* commit '4544562a93e020f81921f33b89e2f0748acb3f5c':
KitKat SMS APIs DevByte Sample Code
2014-01-09 21:35:40 +00:00
Svetoslav Ganov
218f323d8a
am f9c86a50: am c100e53e: am 79efac6b: Merge "Add print samples to the ApiDemos app." into klp-dev
...
* commit 'f9c86a50ff4bef01bb4f468efcb841565e0cc94f':
Add print samples to the ApiDemos app.
2014-01-09 21:35:38 +00:00
Dirk Dougherty
74f434e51c
am 2b39eabe: am c1ef60a2: am 1c254de3: Merge "Add kk to redirects file." into klp-dev
...
* commit '2b39eabe86f2254219eeaae32e0f3dbd39adf7c6':
Add kk to redirects file.
2014-01-09 21:35:37 +00:00
Roman Nurik
c21b656862
am 3a0a7d6a: am 68558338: am 3b6fb5c0: Merge "Add Android 4.4 Immersive Mode DevByte sample code." into klp-dev
...
* commit '3a0a7d6a2a2f6a83153d2eeb75afe007551c6890':
Add Android 4.4 Immersive Mode DevByte sample code.
2014-01-09 21:35:36 +00:00