Commit Graph

17202 Commits

Author SHA1 Message Date
Andrew Hsieh
dd2fff275d am a59f8c38: am 9fe3045f: am 2f5539a4: am 7a042ce4: am 9376f14e: Merge "Change sample native-codec\'s minSDK to android-21"
* commit 'a59f8c3858398efa7b4da7369fcda760de284c7e':
2015-03-23 22:34:31 +00:00
Neil Fuller
d551c112db am 94124c3a: am 09ac46ee: am 29329726: am 29923a44: am a6e8e0d8: Merge "Remove dependencies on FloatMath"
* commit '94124c3a95f546ce918c073f38f5d93ff5b140af':
2015-03-23 22:34:29 +00:00
Andrew Hsieh
d5029c4ceb am bb155e97: am ad8bbae8: am d6bf7265: am e6a62f60: am dc942b9c: Merge "Make memory_order_acquire visible in global namespace"
* commit 'bb155e9792295e7871513f0fa9b7387e88228510':
2015-03-23 22:34:27 +00:00
Andrew Hsieh
c92e428e7b am 24d5b893: am f5a01d4e: am 64724bcc: am 0d879513: am 106046ae: Merge "Rename android-L to android-21"
* commit '24d5b893c4cab5ba4c1ca926716ff7c474dc276d':
2015-03-23 22:34:25 +00:00
Andrew Hsieh
8f142f0f7b am f7b6d695: am 5e8eedd6: am 2a01c3f3: am 93dd2f8a: am b02b4bce: Merge "Add missing function prototypes in time.h"
* commit 'f7b6d6952554da43f383f2d0e582df31f6156390':
2015-03-23 22:34:21 +00:00
Trevor Johns
5dc880ba16 am 9236abd4: am a9bf7946: am 85e87c55: am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev
* commit '9236abd430fda40d5666279d63d3c927f9ae715a':
2015-03-23 22:34:19 +00:00
Chenjie Luo
17176ee8d2 am 4f5f19e3: am af09226b: am 950879ac: am 88fbf1fe: Update test runner for cts tests in testrunner/test_defs.xml
* commit '4f5f19e32d649fc2674bb41d6696af2cb2ff87f1':
2015-03-23 22:34:15 +00:00
Tor Norbye
9171f44820 am 4351ec4c: am e2b1e75f: am 3fa7b69d: am 3b2fe7eb: Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev
* commit '4351ec4c6b1a12739bab3203dbfb6ebfee18cf7e':
2015-03-23 22:34:11 +00:00
Deepanshu Gupta
d776c9580b am 699e02ec: am 512358bf: am e1a3f47e: am 2c34d62a: Update LayoutLib API level to 12.
* commit '699e02ecf6358b4284ad56ae0173a5f82f8cac79':
2015-03-23 22:34:07 +00:00
Christopher Ferris
16fc8ee242 am 79e8c927: am 41560605: am de394866: am bb0d2060: Merge "Do not call art-on macro by default." into lmp-dev
* commit '79e8c9278029a9b4bd2fcf18099535494e110215':
2015-03-23 22:34:03 +00:00
Tor Norbye
4643d98a89 am 1d3a49eb: am 2a279e62: am a22d6f70: am 0eac39db: 17782530: Annotations using retention policy source remain in .class
* commit '1d3a49eb0b7a3547e449f5da185512de09c6c1b0':
2015-03-23 22:33:59 +00:00
Xavier Ducrohet
bea5a34328 am 1b7a670c: am 6f0ed4fc: am cb002a83: am 3c0cd8cf: Merge "Package libc++.so in the build-tools." into lmp-dev
* commit '1b7a670c314436810b1998d9463e67da83bec0f4':
2015-03-23 22:33:57 +00:00
Ruben Brunk
91d86bbffd am 9dc60411: am a0f3d469: am f431341c: am e5aa0f3f: runtest: Remove unused CtsTestStubs dependency.
* commit '9dc60411a276dcdaed7494c758e9cc661dea90bb':
2015-03-23 22:33:55 +00:00
Yigit Boyar
f48c96cfed am 27981903: am ef4e2cb0: am 5ea5cc3d: am 52af2550: Don\'t layout removed scrap views
* commit '279819035dcca6a9680a7720bfee5077509e67ee':
2015-03-23 22:33:53 +00:00
Stephen Hines
f42aeb8e2b am 6ad70fb2: am 2b36e292: am 513c112f: resolved conflicts for merge of 3f2caae2 to lmp-dev-plus-aosp
* commit '6ad70fb28c22f39ad5ce212fc74133487c41182d':
2015-03-23 22:33:49 +00:00
Andrew Hsieh
14bfe01ece am b83c6c58: am 82835cc0: am 4981bc73: am 4217c22d: am bb148d92: Merge "Refresh android-L headers (WW40)"
* commit 'b83c6c58438070223ff67c9e62cb6695129fde1c':
2015-03-23 22:33:45 +00:00
Dake Gu
1708933662 am 1240ac4f: am 999496fe: am 671225a1: am 221b154a: SupportLeanbackDemo: Fix crash of launch Detail from Search
* commit '1240ac4fdfe922a8b00d48f1b8b7e7c2a44c43c7':
2015-03-23 22:33:41 +00:00
Andrew Hsieh
2f9a849925 am ce31f426: am dbfc578f: am 3dc64520: am 1978baa1: am ec2d5674: Merge "Bump up clang vesion accepting __builtin_isnan __attribute__((pcs("aapcs")))"
* commit 'ce31f426a0fb30ae5cdad9261edbe51b5d4138d4':
2015-03-23 22:33:37 +00:00
Andrew Hsieh
10482cd8e5 am c8041e9f: am c543f0de: am a428c4d6: am f5ad59d4: am 154cb254: Merge "Add posix_memalign to libc.so for API 17,18,19"
* commit 'c8041e9fbc5379deec77f62fd7de4eb453426007':
2015-03-23 22:33:33 +00:00
Andrew Hsieh
984b2a9225 am 13b3ffe0: am d0e5f353: am 7d27bb77: am 132945b9: am c316a240: Merge "Added sys/ucontext.h and sys/user.h to all API levels."
* commit '13b3ffe0b6dc80a904975b25b869b7813ef3980a':
2015-03-23 22:33:28 +00:00
Dan Albert
685cf9f137 am c2738b28: am 58b157f4: am 48a1ff86: am 9bc92deb: am 20d16a75: Merge "Silence lcov existence test output."
* commit 'c2738b28ca23e13cb0fc5a706646c67ba9c7c6bb':
2015-03-23 22:33:24 +00:00
Xavier Ducrohet
ac38e96d40 am 5ec1247b: am c4f43d23: am 8439bda6: am 91909fae: Prepare the SDK component version numbers.
* commit '5ec1247bcbf5341042ad6e99d93b3e5eeb412297':
2015-03-23 22:33:20 +00:00
Dan Albert
fea11cfec0 am 2ec0acda: am 4876083d: am f9026b36: am cbe2394e: am 217d230a: Merge "Add acov for coverage gathering/reporting."
* commit '2ec0acda65210c651ac25e84f6d7634c47e1af72':
2015-03-23 22:33:16 +00:00
Andrew Hsieh
7e167b910e am 151ad0ec: 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 '151ad0ecd836db03ed48299aa84e896db5bcbfa9':
2015-03-23 22:33:14 +00:00
Dake Gu
6076b2e3fb am cfe55935: am 2d0be53e: am 0b5fedbd: am 7c4d38c4: SupportLeanbackDemo: dont override fragment\'s object from activity
* commit 'cfe5593564ad8b776ae5517b01a77f066355730f':
2015-03-23 22:33:11 +00:00
Dake Gu
f5703a5db6 am e263d338: am 7ff194b3: am 7bacdb31: am 7c6a3e4f: Merge "Use image card view for DetailsFragment example" into lmp-dev
* commit 'e263d338dfca5a52c42e700c1e4ee64b0008a784':
2015-03-23 22:33:03 +00:00
Andrew Hsieh
9c5d7807f6 am 537cc2df: am 7e78cb83: am 0a8ec948: am 726f6d87: am 5b664707: Merge "Bugfix for libportable to make compile happy."
* commit '537cc2dfd21032dfd460b495a11079b08436996a':
2015-03-23 22:33:01 +00:00
Craig Stout
e51955f26c am e8f243d8: am 63892f93: am d50f3f06: am a0f2a8db: Fix build.
* commit 'e8f243d88b27ce5a76ebf5285a66f1a4faac10f2':
2015-03-23 22:32:58 +00:00
Craig Stout
929257aa41 am 558decc6: am 20e5f5b8: am bd1630f9: am 76d6eba7: Use new callback for search by intent.
* commit '558decc60635b5a4e7a6acbe9c15dd96e2c97cf2':
2015-03-23 22:32:56 +00:00
Siva Velusamy
22de5ab781 am ef7a5e53: am 39781ab5: am bb5620c6: am bd2bea18: Update revision of Android SDK USB driver for Windows
* commit 'ef7a5e5301bacfd70c662e34d96923f051fa20e6':
2015-03-23 22:32:53 +00:00
Siva Velusamy
acfedd3f45 am 4ebefd94: am f6349067: am 715dcb37: am 6ae0b776: Android SDK Windows USB driver: Project Tango pid
* commit '4ebefd94c34fe83be86ada43ab9085f75e6bd951':
2015-03-23 22:32:50 +00:00
Andrew Hsieh
958ca75c6e am 64272e06: am de2f9520: am 4d8856da: am 6b801349: Merge "Remove out-dated android-20 and android-21 now called android-L" into lmp-dev
* commit '64272e0656b91b3e9737d4c490539b1131cb3b5f':
2015-03-23 22:32:47 +00:00
Andrew Hsieh
aa6f7e8b23 am d104956c: am f0b763f1: am 076b3b27: am 5c0471db: am 3941c44f: Merge "Add support for x86 to hello-neon sample"
* commit 'd104956cba543e697da2407f56799df49fe03a64':
2015-03-23 22:32:45 +00:00
Andrew Hsieh
2f9f559430 am 83866a59: am c5f67d2d: am 6174c4c4: am 53a20e54: am a8c78c38: Merge "Refresh android-L headers/libs (WW37)"
* commit '83866a59215711d38229bc69233fe37e4fbc759e':
2015-03-23 22:32:43 +00:00
Trevor Johns
0ec0146a3a am 7e52346e: (-s ours) 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 '7e52346e89bc0a13e9dcc3bef3d297f577285884':
2015-03-23 22:32:41 +00:00
Takeshi Hagikura
e74db0f919 am 4786b8c2: 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 '4786b8c2f1dcb1b95ca27eeac1efe72b6d7ecac9':
2015-03-23 22:32:39 +00:00
Sky Faber
bfdb5efd5e am ae0d26b5: (-s ours) am 496d451c: am a5d6afdc: am 2247b043: DO NOT MERGE: idegen: Skip directories named *.java when parsing source.
* commit 'ae0d26b515a64a7d62fa2fd9855bf20d590223e7':
2015-03-23 22:32:37 +00:00
Trevor Johns
4b12927cc0 am 09e00e7e: am 8afef9e7: am 72f065ea: am 7876b306: am baf6829e: am f420ff0d: Add browseable samples for Clockwork Beryl
* commit '09e00e7edd58c667b5db8c3d0ef25e95921f6e73':
2015-03-23 22:32:33 +00:00
Joe Fernandez
c47e35d437 am 0b968c5c: (-s ours) 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 '0b968c5c927bbf76c18374d02df10869106f4a1f':
2015-03-23 22:32:30 +00:00
Joe Fernandez
cfa0cd64fd am b5128eef: 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
* commit 'b5128eefb390c4e3ef0f880be3909a5be37b5535':
2015-03-23 22:32:25 +00:00
Joe Fernandez
b07da6ae43 am 8464fd4e: 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 '8464fd4e9426f01d603e382729b1ba0b1e4981f1':
2015-03-23 22:32:20 +00:00
Yigit Boyar
b46a6fdb11 am 3d52c126: am 6b04206c: am c30782ed: am bbc4455b: Merge "Add color picker to cardview demo" into lmp-mr1-dev
* commit '3d52c126a9d511db1ae610ca92b7ffab60db6bcb':
2015-03-23 22:32:14 +00:00
Xavier Ducrohet
5ae8464e35 am 1affb370: (-s ours) 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 '1affb370ce408675b83f17b2bdc7589c2864e36f':
2015-03-23 22:32:13 +00:00
Chenjie Luo
76ed495665 am e17ac70b: 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 'e17ac70bf1c5642ec0fdc4b1679cf183d48cb9fd':
2015-03-23 22:32:07 +00:00
Baligh Uddin
d7c9f95f96 am d01aaa41: (-s ours) 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 'd01aaa411c44d34f0188887ce11e8124b3e4cce7':
2015-03-23 22:32:05 +00:00
Baligh Uddin
e33cc1675b am e1fc8d15: (-s ours) 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 'e1fc8d157314069313bb7d7dc54fb326c0dfec22':
2015-03-23 22:32:03 +00:00
Xavier Ducrohet
fd37f1e6d0 am 7f0baca5: (-s ours) am 97565460: am 297089b1: am 946bfb51: Update Build Tools version to <API>.0.1. DO NOT MERGE.
* commit '7f0baca5343c718f3853c18f8cde3421cea3a05e':
2015-03-23 22:32:02 +00:00
Trevor Johns
82c22f8ad7 am 3c76c956: am 4b16c84f: am c60b2dd6: am 36274ac5: Add additional samples for L to sdk.atree
* commit '3c76c95619c486760edb8e4ad38b0694f82b5fec':
2015-03-23 22:31:55 +00:00
Trevor Johns
6bf64a8e4e am 7c7c2d49: am 34ebd03f: am 4b5d8355: am 6876a9cf: Add browseable samples for L SDK release
* commit '7c7c2d49c3f217c67ecbeeb5324710768a608317':
2015-03-23 22:31:50 +00:00
Trevor Johns
14cc780d4b am 8ffff7f9: am 84f0d412: am 4e09738a: am 66b6f721: Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev
* commit '8ffff7f9e83b44a1d2268b1425df0ae1011acaf7':
2015-03-23 22:31:45 +00:00