Commit Graph

13001 Commits

Author SHA1 Message Date
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
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
Santos Cordon
a706c74450 Adding telecomm to classpath and removing old Phone directory
references.

Change-Id: I55a309ae8912cf8cb9e27c9a5ed79cd34353a0a4
2014-01-06 15:00:07 -08:00
Andrew Hsieh
23b163fdd8 am e3a07da0: am 9dabc24f: am 4abacac3: Merge "Fix prototype of poll"
* commit 'e3a07da04db34befb689ee78a37d91703597679d':
  Fix prototype of poll
2013-11-03 17:29:36 -08:00
Andrew Hsieh
e3a07da04d am 9dabc24f: am 4abacac3: Merge "Fix prototype of poll"
* commit '9dabc24f4117c6e57888b1202845fed8e03c8edb':
  Fix prototype of poll
2013-11-03 16:58:19 -08:00
Andrew Hsieh
9dabc24f41 am 4abacac3: Merge "Fix prototype of poll"
* commit '4abacac32dcdc433b83b819ab6e03b958bbfb31c':
  Fix prototype of poll
2013-11-03 16:53:20 -08:00
Andrew Hsieh
4abacac32d Merge "Fix prototype of poll" 2013-11-04 00:30:46 +00:00
Dirk Dougherty
5969d205e6 am 5e90c148: Merge commit \'2397b75d\' into manualmerge
* commit '5e90c1485a5efe55502884a9f63994914ac19fac':
  Fix broken javadoc reference.
2013-11-01 19:44:48 -07:00
Dirk Dougherty
5e90c1485a Merge commit '2397b75d' into manualmerge
Conflicts:
	samples/browseable/TextLinkify/_index.jd

Change-Id: I2b64b72766d8543e238461f74c7bd4a1959a9e37
2013-11-01 19:38:11 -07:00
Dirk Dougherty
35da2acf9c am 9b903167: am 3ef2b0f3: Add StorageProvider sample code to browseables.
* commit '9b903167a08ae700247e69f4c0701082d1150291':
  Add StorageProvider sample code to browseables.
2013-11-01 19:22:25 -07:00
quddusc
0f2ebe84da am 60737e95: Merge commit \'3943cdc9\' into manualmerge2
* commit '60737e950718d02f206a9da5928299e28df4e382':
  Updated browsable sample descriptions.
2013-11-01 19:22:24 -07:00
Dirk Dougherty
9b903167a0 am 3ef2b0f3: Add StorageProvider sample code to browseables.
* commit '3ef2b0f3711df9249ea48ac9cd4b08e663d45f18':
  Add StorageProvider sample code to browseables.
2013-11-01 19:20:18 -07:00
quddusc
60737e9507 Merge commit '3943cdc9' into manualmerge2
Conflicts:
	samples/browseable/ActivityInstrumentation/_index.jd
	samples/browseable/TextLinkify/_index.jd

Change-Id: Ia9a333bd09d2e7e9417a560581c40bd02d295c12
2013-11-01 19:17:20 -07:00
Elliott Hughes
356cdcbd27 am f99585bd: am ff11bce0: am 07bdc2b8: Merge "Fix build."
* commit 'f99585bddd07da98a018e70e29bad55e2204e6ea':
  Fix build.
2013-10-31 22:32:46 -07:00
Elliott Hughes
f99585bddd am ff11bce0: am 07bdc2b8: Merge "Fix build."
* commit 'ff11bce0978d56ce571454d16084028df4106e13':
  Fix build.
2013-10-31 21:29:06 -07:00
Elliott Hughes
ff11bce097 am 07bdc2b8: Merge "Fix build."
* commit '07bdc2b8e6980173ca9e8070803dcaad042e52c2':
  Fix build.
2013-10-31 21:26:13 -07:00
Elliott Hughes
07bdc2b8e6 Merge "Fix build." 2013-11-01 04:24:08 +00:00
Elliott Hughes
0d86e637f6 Fix build.
Change-Id: If09775ab21fef5b1df0222f07443a55190ae7a1c
2013-10-31 18:41:52 -07:00
Andrew Hsieh
61097c7e51 Fix prototype of poll
from poll(struct pollfd *, nfds_t, long) to
poll(struct pollfd *, nfds_t, int)

See 11952073af22568bba0b661f7a9d4402c443a888
and ebfbb367fb

Change-Id: Idba600d4b172404f0a1d5d715febcba8a495a770
2013-11-01 08:33:08 +08:00