Commit Graph

16226 Commits

Author SHA1 Message Date
Dan Albert
c2738b28ca am 58b157f4: am 48a1ff86: am 9bc92deb: am 20d16a75: Merge "Silence lcov existence test output."
* commit '58b157f456d4e92c2dd98c927cdf1436b6cb2d35':
2015-03-21 05:17:52 +00:00
Xavier Ducrohet
5ec1247bcb am c4f43d23: am 8439bda6: am 91909fae: Prepare the SDK component version numbers.
* commit 'c4f43d23e0c56217a684a3090dd7fa80bd1c332d':
2015-03-21 05:17:51 +00:00
Dan Albert
2ec0acda65 am 4876083d: am f9026b36: am cbe2394e: am 217d230a: Merge "Add acov for coverage gathering/reporting."
* commit '4876083de6febf2679f7375a9d6222d63b50278e':
2015-03-21 05:17:49 +00:00
Andrew Hsieh
151ad0ecd8 am cf8c5939: am 7ab39b2a: am 04df6b31: am eef4aba8: Merge "Add missing posix_memalign function in x86 libc.so.functions.txt. (See b.android.com/28834)"
* commit 'cf8c59391775f78dbafb6d93a4c7538a6a161129':
2015-03-21 05:17:47 +00:00
Dake Gu
cfe5593564 am 2d0be53e: am 0b5fedbd: am 7c4d38c4: SupportLeanbackDemo: dont override fragment\'s object from activity
* commit '2d0be53e87f3bc10a6c293901cad8a9dc2123b90':
2015-03-21 05:17:45 +00:00
Dake Gu
e263d338df am 7ff194b3: am 7bacdb31: am 7c6a3e4f: Merge "Use image card view for DetailsFragment example" into lmp-dev
* commit '7ff194b3ebed741e9db0512c0a26a656a09cdfe0':
2015-03-21 05:17:43 +00:00
Andrew Hsieh
537cc2dfd2 am 7e78cb83: am 0a8ec948: am 726f6d87: am 5b664707: Merge "Bugfix for libportable to make compile happy."
* commit '7e78cb836c28adef4c9c2f1eada34d9b6c2894e9':
2015-03-21 05:17:40 +00:00
Craig Stout
e8f243d88b am 63892f93: am d50f3f06: am a0f2a8db: Fix build.
* commit '63892f932c6ff4ea32fed6a8c884b74b648e7311':
2015-03-21 05:17:38 +00:00
Craig Stout
558decc606 am 20e5f5b8: am bd1630f9: am 76d6eba7: Use new callback for search by intent.
* commit '20e5f5b8635049d2e2b4620ccbd29fec13674dab':
2015-03-21 05:17:37 +00:00
Siva Velusamy
ef7a5e5301 am 39781ab5: am bb5620c6: am bd2bea18: Update revision of Android SDK USB driver for Windows
* commit '39781ab591511bcb8aebae26079b93bdc9cc041a':
2015-03-21 05:17:35 +00:00
Siva Velusamy
4ebefd94c3 am f6349067: am 715dcb37: am 6ae0b776: Android SDK Windows USB driver: Project Tango pid
* commit 'f63490677b5b865954cccd13d96f0ed337f55128':
2015-03-21 05:17:33 +00:00
Andrew Hsieh
64272e0656 am de2f9520: am 4d8856da: am 6b801349: Merge "Remove out-dated android-20 and android-21 now called android-L" into lmp-dev
* commit 'de2f9520b968eb1a678f564da15083c944181aa6':
2015-03-21 05:17:30 +00:00
Andrew Hsieh
d104956cba am f0b763f1: am 076b3b27: am 5c0471db: am 3941c44f: Merge "Add support for x86 to hello-neon sample"
* commit 'f0b763f1b6857fb8337e00e8f7fb1ccfc3ca984c':
2015-03-21 05:17:28 +00:00
Andrew Hsieh
83866a5921 am c5f67d2d: am 6174c4c4: am 53a20e54: am a8c78c38: Merge "Refresh android-L headers/libs (WW37)"
* commit 'c5f67d2d0b022ebc3e2a97f3d239947c9c3ce195':
2015-03-21 05:17:27 +00:00
Trevor Johns
7e52346e89 am f9f445e6: am a819c32d: am ca4362bc: am a916086f: am 5aad4e45: am bd48d1e6: (-s ours) am 05ef7f04: DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)
* commit 'f9f445e67368edfdba5626a109cbceea21bcfe0d':
2015-03-21 05:17:22 +00:00
Takeshi Hagikura
4786b8c2f1 am 7eb30d83: am 91655c8f: am 41465421: am 15677158: am 96c8509e: am 3bb3da96: (-s ours) resolved conflicts for merge of 11e09fc0 to klp-modular-dev
* commit '7eb30d83f1f56d54e99da3a8d9428004f4567ece':
2015-03-21 05:17:20 +00:00
Sky Faber
ae0d26b515 am 496d451c: am a5d6afdc: am 2247b043: DO NOT MERGE: idegen: Skip directories named *.java when parsing source.
* commit '496d451c960d52c4ea3bf59cde2a902ca20a54f2':
2015-03-21 05:17:14 +00:00
Trevor Johns
09e00e7edd am 8afef9e7: am 72f065ea: am 7876b306: am baf6829e: am f420ff0d: Add browseable samples for Clockwork Beryl
* commit '8afef9e7f9e295b9be2b270bc60edf2221b94b4e':
2015-03-21 05:17:09 +00:00
Joe Fernandez
0b968c5c92 am d9475320: am 939f4bfd: am 3cbcd20f: am f43722b7: am 4a5ce9ae: Merge "DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)" into lmp-dev
* commit 'd9475320a469cef6fe392c2dcdef383fff69917f':
2015-03-21 05:17:04 +00:00
Joe Fernandez
b5128eefb3 am cd709729: am 35828e85: am db9b560e: am d74a44da: am de3f94a0: Merge "Deletes the wear samples that have been commited in the wrong place. Updates the location of wear samples in sdk.atree Adds SpeedTracker wear sample (https://googleplex-android-review.git.corp.goo
* commit 'cd7097298d42eda1f31d3d65332408cdc18c5747':
2015-03-21 05:16:59 +00:00
Joe Fernandez
8464fd4e94 am 773435f9: am e054c2b3: am 705a1bb4: am d42d6553: am c789ef84: Merge "sdk.atree: Move JobScheduler sample from \'ui/views\' to \'background\'" into lmp-dev
* commit '773435f9f07d7d85838b5e540ba56e99f289adbf':
2015-03-21 05:16:53 +00:00
Yigit Boyar
3d52c126a9 am 6b04206c: am c30782ed: am bbc4455b: Merge "Add color picker to cardview demo" into lmp-mr1-dev
* commit '6b04206cdaad5aa5c97fb4758f9658749d325a9b':
2015-03-21 05:16:46 +00:00
Xavier Ducrohet
1affb370ce am 1c1b66af: am 12bc49de: am af87a11e: am 56be755b: am 0a871db0: Merge "Update Build Tools version to <API>.0.2. DO NOT MERGE." into lmp-dev
* commit '1c1b66af29989120523ea2b3620459fd0873558d':
2015-03-21 05:16:39 +00:00
Chenjie Luo
e17ac70bf1 am cad4d4b9: am 46d5f2f0: am c29dc0d2: am 86f364c8: am 3b0ab876: Merge "Modify testrunner/test_defs.xml to delete obsolete cts tests" into lmp-dev
* commit 'cad4d4b97ae90ab24609e68d41c37a0f5c99ce57':
2015-03-21 05:16:31 +00:00
Baligh Uddin
d01aaa411c am 9340911f: (-s ours) am 80eb5b30: (-s ours) am 804aad73: (-s ours) am 6ca01465: (-s ours) am 3a39d4e2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '9340911fdde0dd881eba33a546d9246233e9d9cf':
2015-03-21 05:16:27 +00:00
Baligh Uddin
e1fc8d1573 am dc4b7e3d: (-s ours) am 3afda098: (-s ours) am bb11b4a9: (-s ours) am 568808dd: (-s ours) am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE
* commit 'dc4b7e3dc093e10b110ca11112f082137387a562':
2015-03-21 05:16:23 +00:00
Xavier Ducrohet
7f0baca534 am 97565460: am 297089b1: am 946bfb51: Update Build Tools version to <API>.0.1. DO NOT MERGE.
* commit '9756546087dcf0906d5f42d5539d7090c156e0e5':
2015-03-21 05:16:19 +00:00
Trevor Johns
3c76c95619 am 4b16c84f: am c60b2dd6: am 36274ac5: Add additional samples for L to sdk.atree
* commit '4b16c84fb076ea6e2ba77a542bfa29d60e3c9ad9':
2015-03-21 05:16:13 +00:00
Trevor Johns
7c7c2d49c3 am 34ebd03f: am 4b5d8355: am 6876a9cf: Add browseable samples for L SDK release
* commit '34ebd03fbcc122d2ade907e433e49b58cb462050':
2015-03-21 05:16:09 +00:00
Trevor Johns
8ffff7f9e8 am 84f0d412: am 4e09738a: am 66b6f721: Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev
* commit '84f0d412b6d1e379d296bc5e23cb5cc25ae5d30f':
2015-03-21 05:16:04 +00:00
Trevor Johns
33109b2ca9 am 339006dc: am 72687bd8: am ca8bc22a: sdk.atree: Fix typo and remove legacy BluetoothChat sample
* commit '339006dcbd4b15970b048bbf36f36db76fe0c14d':
2015-03-21 05:16:00 +00:00
Trevor Johns
e93187ca61 am 8dd5fc0f: am 70c55867: am d991bed6: Resolved conflicts for merge of \'9875ec66\' into lmp-dev
* commit '8dd5fc0f143058b3c56dbcc300f7c6f566dd5cbc':
2015-03-21 05:15:55 +00:00
Andrew Hsieh
b57554b086 am 16385db0: am 1305bed1: am c13cf09c: Merge "Add asm/a.out.h to arm64/mips/mips64"
* commit '16385db02a9d9a3c443ae224501a7f53fc772e23':
  Add asm/a.out.h to arm64/mips/mips64
2015-03-21 05:15:52 +00:00
Andrew Hsieh
ee4e746d78 am 2cd2f260: am 0b4823b9: am 4e47988f: Merge "Remove macros putc*/getc* from API<21 stdio.h to use"
* commit '2cd2f260747276a0f58ecd40edd5c5c3bd905ab1':
  Remove macros putc*/getc* from API<21 stdio.h to use
2015-03-21 05:15:49 +00:00
Andrew Hsieh
05d3b18900 am 11f8d20b: am 7a042ce4: am 9376f14e: Merge "Change sample native-codec\'s minSDK to android-21"
* commit '11f8d20b62a49077d06d5967a42d1597d89a5e41':
  Change sample native-codec's minSDK to android-21
2015-03-21 05:15:44 +00:00
Tadashi G. Takaoka
d4953245d8 am 3f6cd5d4: am 97f11e1c: (DO NOT MERGE) Fix sample SoftKeyboard preference activity
* commit '3f6cd5d4ab073e0eac4eecc4a5f656b14a67599a':
2015-03-21 05:15:39 +00:00
Neil Fuller
7c2255556c am b48e8788: am 29923a44: am a6e8e0d8: Merge "Remove dependencies on FloatMath"
* commit 'b48e8788934fde9669529a3785591b32ade978cd':
  Remove dependencies on FloatMath
2015-03-21 05:15:36 +00:00
Andrew Hsieh
e2a85f8bc3 am 14576ee4: am e6a62f60: am dc942b9c: Merge "Make memory_order_acquire visible in global namespace"
* commit '14576ee4b62f5b195d6676387898363e9b32c27e':
  Make memory_order_acquire visible in global namespace
2015-03-21 05:15:34 +00:00
Andrew Hsieh
2dfa93d344 am dcb2dcb7: am 0d879513: am 106046ae: Merge "Rename android-L to android-21"
* commit 'dcb2dcb74522046688a2003926a38d4f2cbfa84d':
  Rename android-L to android-21
2015-03-21 05:15:26 +00:00
Andrew Hsieh
995195513d am dcebc2f1: am 93dd2f8a: am b02b4bce: Merge "Add missing function prototypes in time.h"
* commit 'dcebc2f1d850c50c203417ee227833f3609c0c2c':
  Add missing function prototypes in time.h
2015-03-21 05:15:23 +00:00
Trevor Johns
8f9093ec36 am 030c8097: am 913f8146: am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev
* commit '030c8097527655dbbf10aa9f07d50c9975cb4ecb':
2015-03-21 05:15:21 +00:00
Chenjie Luo
7844784f7f am d47b5cee: am 9ac2afe4: am 88fbf1fe: Update test runner for cts tests in testrunner/test_defs.xml
* commit 'd47b5cee8212d41a546d332c7949468537c8aa03':
2015-03-21 05:15:19 +00:00
Tor Norbye
950cabd11c am 1181e941: am 3f75a9a0: am 3b2fe7eb: Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev
* commit '1181e941932c20cf5a7b7b284694a12942df563b':
2015-03-21 05:15:17 +00:00
Deepanshu Gupta
a8a9f14b3e am 9fabccbf: am e5a9f9d0: am 2c34d62a: Update LayoutLib API level to 12.
* commit '9fabccbf9b4ac7368dab77596c722b82accb8608':
2015-03-21 05:15:15 +00:00
Christopher Ferris
fed207e0ea am 8aa117a3: am 9329e4f0: am bb0d2060: Merge "Do not call art-on macro by default." into lmp-dev
* commit '8aa117a3b0f7a0c87830a09c73dc2e44c757ded1':
2015-03-21 05:15:13 +00:00
Tor Norbye
28f6763394 am de4255ab: am 7fb913fe: am 0eac39db: 17782530: Annotations using retention policy source remain in .class
* commit 'de4255ab85e9a3ff6d4addf550464dab8892d1b5':
2015-03-21 05:15:11 +00:00
Xavier Ducrohet
cc90e86ee0 am d36c4dd6: am 21af667f: am 3c0cd8cf: Merge "Package libc++.so in the build-tools." into lmp-dev
* commit 'd36c4dd6464e1bd8e7fb26d2fc638f63030bcaea':
2015-03-21 05:15:09 +00:00
Chris Banes
f5f6697dd1 am 711b2dc8: am cb838606: Merge "Update Support7Demos for L appcompat" into lmp-mr1-dev
* commit '711b2dc8c1ba0f583834fee8bbc9edd0885fe4aa':
2015-03-21 05:15:06 +00:00
Ruben Brunk
c65f5b312c am 4983e18f: am e5aa0f3f: runtest: Remove unused CtsTestStubs dependency.
* commit '4983e18f6cc22706ee14503247cecf7f7dc26112':
2015-03-21 05:15:04 +00:00
Yigit Boyar
589a179e14 am 0cc925e5: am 52af2550: Don\'t layout removed scrap views
* commit '0cc925e5dc9b80f1950e4a089133196e105056ee':
2015-03-21 05:15:02 +00:00