Commit Graph

17901 Commits

Author SHA1 Message Date
Andrew Hsieh
a59f8c3858 am 9fe3045f: am 2f5539a4: am 7a042ce4: am 9376f14e: Merge "Change sample native-codec\'s minSDK to android-21"
* commit '9fe3045fe1e1611392cf7ab4a52d340bf35d9c90':
2015-03-21 05:18:33 +00:00
Neil Fuller
94124c3a95 am 09ac46ee: am 29329726: am 29923a44: am a6e8e0d8: Merge "Remove dependencies on FloatMath"
* commit '09ac46eeed387ecb893f072e7630b8bc390f8343':
2015-03-21 05:18:31 +00:00
Andrew Hsieh
bb155e9792 am ad8bbae8: am d6bf7265: am e6a62f60: am dc942b9c: Merge "Make memory_order_acquire visible in global namespace"
* commit 'ad8bbae857a5fc368b78badda0bc62fd273700ee':
2015-03-21 05:18:30 +00:00
Andrew Hsieh
24d5b893c4 am f5a01d4e: am 64724bcc: am 0d879513: am 106046ae: Merge "Rename android-L to android-21"
* commit 'f5a01d4e74771a1e1d6d206ac46585d47b4f7f18':
2015-03-21 05:18:28 +00:00
Andrew Hsieh
f7b6d69525 am 5e8eedd6: am 2a01c3f3: am 93dd2f8a: am b02b4bce: Merge "Add missing function prototypes in time.h"
* commit '5e8eedd60eefbffe1015cf2a31acee4a466aac06':
2015-03-21 05:18:26 +00:00
Trevor Johns
9236abd430 am a9bf7946: am 85e87c55: am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev
* commit 'a9bf79464cdde68bcd73023423743e9c935a31f4':
2015-03-21 05:18:24 +00:00
Chenjie Luo
4f5f19e32d am af09226b: am 950879ac: am 88fbf1fe: Update test runner for cts tests in testrunner/test_defs.xml
* commit 'af09226b381e8d5abf1cda0223229f81029e85c9':
2015-03-21 05:18:22 +00:00
Tor Norbye
4351ec4c6b am e2b1e75f: am 3fa7b69d: am 3b2fe7eb: Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev
* commit 'e2b1e75f19247376f48d77e06bbaef8bd4ea67a0':
2015-03-21 05:18:20 +00:00
Deepanshu Gupta
699e02ecf6 am 512358bf: am e1a3f47e: am 2c34d62a: Update LayoutLib API level to 12.
* commit '512358bf8636d90d0b2b3d74cc5640459c23e24c':
2015-03-21 05:18:16 +00:00
Christopher Ferris
79e8c92780 am 41560605: am de394866: am bb0d2060: Merge "Do not call art-on macro by default." into lmp-dev
* commit '415606056c8a1c70e1817c15c0d4c71f395aeed6':
2015-03-21 05:18:14 +00:00
Tor Norbye
1d3a49eb0b am 2a279e62: am a22d6f70: am 0eac39db: 17782530: Annotations using retention policy source remain in .class
* commit '2a279e626791cec6d0af518139dab8e29f1ca263':
2015-03-21 05:18:12 +00:00
Xavier Ducrohet
1b7a670c31 am 6f0ed4fc: am cb002a83: am 3c0cd8cf: Merge "Package libc++.so in the build-tools." into lmp-dev
* commit '6f0ed4fc66a7c6a1a0491d00aaae5e0dc67f9e64':
2015-03-21 05:18:10 +00:00
Ruben Brunk
9dc60411a2 am a0f3d469: am f431341c: am e5aa0f3f: runtest: Remove unused CtsTestStubs dependency.
* commit 'a0f3d4698656d69fe6261d08005edc3236e3ffcd':
2015-03-21 05:18:08 +00:00
Yigit Boyar
279819035d am ef4e2cb0: am 5ea5cc3d: am 52af2550: Don\'t layout removed scrap views
* commit 'ef4e2cb02ed3a0999af02b20ad6fd1c600d6530a':
2015-03-21 05:18:05 +00:00
Stephen Hines
6ad70fb28c am 2b36e292: am 513c112f: resolved conflicts for merge of 3f2caae2 to lmp-dev-plus-aosp
* commit '2b36e2928ba7b7ba22e0e926b6f971b864c524a1':
2015-03-21 05:18:03 +00:00
Andrew Hsieh
b83c6c5843 am 82835cc0: am 4981bc73: am 4217c22d: am bb148d92: Merge "Refresh android-L headers (WW40)"
* commit '82835cc04ea8d0d4f21561c9c8744ad14ef9b33a':
2015-03-21 05:18:01 +00:00
Dake Gu
1240ac4fdf am 999496fe: am 671225a1: am 221b154a: SupportLeanbackDemo: Fix crash of launch Detail from Search
* commit '999496fe3781b7afe5967fa649b995a62289814c':
2015-03-21 05:17:59 +00:00
Andrew Hsieh
ce31f426a0 am dbfc578f: am 3dc64520: am 1978baa1: am ec2d5674: Merge "Bump up clang vesion accepting __builtin_isnan __attribute__((pcs("aapcs")))"
* commit 'dbfc578f8a16cb486d60ef32ba22115e379c4ae3':
2015-03-21 05:17:58 +00:00
Andrew Hsieh
c8041e9fbc am c543f0de: am a428c4d6: am f5ad59d4: am 154cb254: Merge "Add posix_memalign to libc.so for API 17,18,19"
* commit 'c543f0def147732198ea619f8b89c8746ca52548':
2015-03-21 05:17:56 +00:00
Andrew Hsieh
13b3ffe0b6 am d0e5f353: am 7d27bb77: am 132945b9: am c316a240: Merge "Added sys/ucontext.h and sys/user.h to all API levels."
* commit 'd0e5f3539a900bfad34958f68c38d98b36c118af':
2015-03-21 05:17:54 +00:00
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