Commit Graph

16024 Commits

Author SHA1 Message Date
Chenjie Luo
e589ead76b am 9d91239a: am b793668b: am 3b0ab876: Merge "Modify testrunner/test_defs.xml to delete obsolete cts tests" into lmp-dev
* commit '9d91239a4da7dabeed034043d67c1eee6e9d3598':
2014-10-26 00:51:32 +00:00
Baligh Uddin
7ad7dee0ff am b026fa1f: (-s ours) am 3bef59ab: (-s ours) am 3a39d4e2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'b026fa1ffcbcc97ecc609213a3e7b729591fb67d':
2014-10-26 00:51:31 +00:00
Baligh Uddin
75cee6db27 am fd23c3f1: (-s ours) am d5c6c1cd: (-s ours) am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE
* commit 'fd23c3f1a2e33bde9f1e0312a37f20aafd291d9c':
2014-10-26 00:51:30 +00:00
Xavier Ducrohet
37dd47616b am 824490c6: (-s ours) am f2dcbd2e: (-s ours) am 946bfb51: Update Build Tools version to <API>.0.1. DO NOT MERGE.
* commit '824490c66c387b4dd840463ac739ed67d5f64483':
2014-10-26 00:51:29 +00:00
Trevor Johns
f3997da435 am 9e09cc99: am cc763b72: am 36274ac5: Add additional samples for L to sdk.atree
* commit '9e09cc99292464a394f843c3b700098a4e81b92c':
2014-10-26 00:51:28 +00:00
Trevor Johns
7dc09a8759 am 34dd1759: am de236d16: am 6876a9cf: Add browseable samples for L SDK release
* commit '34dd175908ec75cc63c5b29b1932d3c0aff65b77':
2014-10-26 00:51:28 +00:00
Trevor Johns
dbdbc00b33 am cfec1532: am e3e839e5: am 66b6f721: Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev
* commit 'cfec1532dc354ddaa2409ec4aa8f25c7172dba57':
2014-10-26 00:51:27 +00:00
Trevor Johns
87c7efeb06 am 6bf079a3: am 8176b906: am ca8bc22a: sdk.atree: Fix typo and remove legacy BluetoothChat sample
* commit '6bf079a32f0ad93942ee90c0f67b7782e51bf54f':
2014-10-26 00:51:26 +00:00
Trevor Johns
cf30383ad2 am 12c9391b: am 3beb9eae: am d991bed6: Resolved conflicts for merge of \'9875ec66\' into lmp-dev
* commit '12c9391bc7db23cc00385ba797e02220555a1e89':
2014-10-26 00:51:25 +00:00
Andrew Hsieh
6974f39ad4 am 220869bb: am d10b06eb: am 1305bed1: am c13cf09c: Merge "Add asm/a.out.h to arm64/mips/mips64"
* commit '220869bbd6a3f9254dcda0b88ae85ed170158750':
2014-10-26 00:51:24 +00:00
Andrew Hsieh
9e7c1ba2ad am 8d9384e2: am 10efbc14: am 0b4823b9: am 4e47988f: Merge "Remove macros putc*/getc* from API<21 stdio.h to use"
* commit '8d9384e23e82f427defe72f5d5507860de01d264':
2014-10-26 00:51:23 +00:00
Andrew Hsieh
50875b4e09 am 9fe3045f: am 2f5539a4: am 7a042ce4: am 9376f14e: Merge "Change sample native-codec\'s minSDK to android-21"
* commit '9fe3045fe1e1611392cf7ab4a52d340bf35d9c90':
2014-10-26 00:51:22 +00:00
Neil Fuller
75ec1f4727 am 09ac46ee: am 29329726: am 29923a44: am a6e8e0d8: Merge "Remove dependencies on FloatMath"
* commit '09ac46eeed387ecb893f072e7630b8bc390f8343':
2014-10-26 00:51:21 +00:00
Andrew Hsieh
49641f9dc7 am ad8bbae8: am d6bf7265: am e6a62f60: am dc942b9c: Merge "Make memory_order_acquire visible in global namespace"
* commit 'ad8bbae857a5fc368b78badda0bc62fd273700ee':
2014-10-26 00:51:20 +00:00
Andrew Hsieh
290414d49f am f5a01d4e: am 64724bcc: am 0d879513: am 106046ae: Merge "Rename android-L to android-21"
* commit 'f5a01d4e74771a1e1d6d206ac46585d47b4f7f18':
2014-10-26 00:51:19 +00:00
Andrew Hsieh
45b1fd4212 am 5e8eedd6: am 2a01c3f3: am 93dd2f8a: am b02b4bce: Merge "Add missing function prototypes in time.h"
* commit '5e8eedd60eefbffe1015cf2a31acee4a466aac06':
2014-10-26 00:51:18 +00:00
Trevor Johns
f95cb6b9ae am a9bf7946: am 85e87c55: am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev
* commit 'a9bf79464cdde68bcd73023423743e9c935a31f4':
2014-10-26 00:51:17 +00:00
Chenjie Luo
7a4a08480b am af09226b: am 950879ac: am 88fbf1fe: Update test runner for cts tests in testrunner/test_defs.xml
* commit 'af09226b381e8d5abf1cda0223229f81029e85c9':
2014-10-26 00:51:15 +00:00
Tor Norbye
154b4806d9 am e2b1e75f: am 3fa7b69d: am 3b2fe7eb: Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev
* commit 'e2b1e75f19247376f48d77e06bbaef8bd4ea67a0':
2014-10-26 00:51:14 +00:00
Deepanshu Gupta
60b1b2a82f am 512358bf: am e1a3f47e: am 2c34d62a: Update LayoutLib API level to 12.
* commit '512358bf8636d90d0b2b3d74cc5640459c23e24c':
2014-10-26 00:51:13 +00:00
Christopher Ferris
cb3211ed30 am 41560605: am de394866: am bb0d2060: Merge "Do not call art-on macro by default." into lmp-dev
* commit '415606056c8a1c70e1817c15c0d4c71f395aeed6':
2014-10-26 00:51:12 +00:00
Tor Norbye
05f968c447 am 2a279e62: am a22d6f70: am 0eac39db: 17782530: Annotations using retention policy source remain in .class
* commit '2a279e626791cec6d0af518139dab8e29f1ca263':
2014-10-26 00:51:11 +00:00
Xavier Ducrohet
03c26f8453 am 6f0ed4fc: am cb002a83: am 3c0cd8cf: Merge "Package libc++.so in the build-tools." into lmp-dev
* commit '6f0ed4fc66a7c6a1a0491d00aaae5e0dc67f9e64':
2014-10-26 00:51:10 +00:00
Ruben Brunk
3ac6fd9ad5 am a0f3d469: am f431341c: am e5aa0f3f: runtest: Remove unused CtsTestStubs dependency.
* commit 'a0f3d4698656d69fe6261d08005edc3236e3ffcd':
2014-10-26 00:51:09 +00:00
Yigit Boyar
d2a3891b59 am ef4e2cb0: am 5ea5cc3d: am 52af2550: Don\'t layout removed scrap views
* commit 'ef4e2cb02ed3a0999af02b20ad6fd1c600d6530a':
2014-10-26 00:51:08 +00:00
Stephen Hines
887b4a4aa4 am 2b36e292: am 513c112f: resolved conflicts for merge of 3f2caae2 to lmp-dev-plus-aosp
* commit '2b36e2928ba7b7ba22e0e926b6f971b864c524a1':
2014-10-26 00:51:07 +00:00
Andrew Hsieh
ebddf9d633 am 82835cc0: am 4981bc73: am 4217c22d: am bb148d92: Merge "Refresh android-L headers (WW40)"
* commit '82835cc04ea8d0d4f21561c9c8744ad14ef9b33a':
2014-10-26 00:51:06 +00:00
Dake Gu
8cb4a5a8d5 am 999496fe: am 671225a1: am 221b154a: SupportLeanbackDemo: Fix crash of launch Detail from Search
* commit '999496fe3781b7afe5967fa649b995a62289814c':
2014-10-26 00:51:05 +00:00
Andrew Hsieh
625d6a469b am dbfc578f: am 3dc64520: am 1978baa1: am ec2d5674: Merge "Bump up clang vesion accepting __builtin_isnan __attribute__((pcs("aapcs")))"
* commit 'dbfc578f8a16cb486d60ef32ba22115e379c4ae3':
2014-10-26 00:51:04 +00:00
Andrew Hsieh
f58d15ca23 am c543f0de: am a428c4d6: am f5ad59d4: am 154cb254: Merge "Add posix_memalign to libc.so for API 17,18,19"
* commit 'c543f0def147732198ea619f8b89c8746ca52548':
2014-10-26 00:51:03 +00:00
Andrew Hsieh
5cc7e2fd25 am d0e5f353: am 7d27bb77: am 132945b9: am c316a240: Merge "Added sys/ucontext.h and sys/user.h to all API levels."
* commit 'd0e5f3539a900bfad34958f68c38d98b36c118af':
2014-10-26 00:51:02 +00:00
Dan Albert
cd829c7364 am 58b157f4: am 48a1ff86: am 9bc92deb: am 20d16a75: Merge "Silence lcov existence test output."
* commit '58b157f456d4e92c2dd98c927cdf1436b6cb2d35':
2014-10-26 00:51:01 +00:00
Xavier Ducrohet
d79029ded6 am c4f43d23: am 8439bda6: am 91909fae: Prepare the SDK component version numbers.
* commit 'c4f43d23e0c56217a684a3090dd7fa80bd1c332d':
2014-10-26 00:50:59 +00:00
Dan Albert
5eac8153bb am 4876083d: am f9026b36: am cbe2394e: am 217d230a: Merge "Add acov for coverage gathering/reporting."
* commit '4876083de6febf2679f7375a9d6222d63b50278e':
2014-10-26 00:50:58 +00:00
Andrew Hsieh
a1182be272 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':
2014-10-26 00:50:55 +00:00
Dake Gu
96295ccc58 am 2d0be53e: am 0b5fedbd: am 7c4d38c4: SupportLeanbackDemo: dont override fragment\'s object from activity
* commit '2d0be53e87f3bc10a6c293901cad8a9dc2123b90':
2014-10-26 00:50:51 +00:00
Dake Gu
8803e4d9ff am 7ff194b3: am 7bacdb31: am 7c6a3e4f: Merge "Use image card view for DetailsFragment example" into lmp-dev
* commit '7ff194b3ebed741e9db0512c0a26a656a09cdfe0':
2014-10-26 00:50:48 +00:00
Andrew Hsieh
33f7223a1d am 7e78cb83: am 0a8ec948: am 726f6d87: am 5b664707: Merge "Bugfix for libportable to make compile happy."
* commit '7e78cb836c28adef4c9c2f1eada34d9b6c2894e9':
2014-10-26 00:50:45 +00:00
Craig Stout
21fee6d33b am 63892f93: am d50f3f06: am a0f2a8db: Fix build.
* commit '63892f932c6ff4ea32fed6a8c884b74b648e7311':
2014-10-26 00:50:42 +00:00
Craig Stout
dc95752104 am 20e5f5b8: am bd1630f9: am 76d6eba7: Use new callback for search by intent.
* commit '20e5f5b8635049d2e2b4620ccbd29fec13674dab':
2014-10-26 00:50:40 +00:00
Siva Velusamy
a41ee80f7e am 39781ab5: am bb5620c6: am bd2bea18: Update revision of Android SDK USB driver for Windows
* commit '39781ab591511bcb8aebae26079b93bdc9cc041a':
2014-10-26 00:50:37 +00:00
Siva Velusamy
acdde75167 am f6349067: am 715dcb37: am 6ae0b776: Android SDK Windows USB driver: Project Tango pid
* commit 'f63490677b5b865954cccd13d96f0ed337f55128':
2014-10-26 00:50:34 +00:00
Andrew Hsieh
0ec3109f3f am de2f9520: am 4d8856da: am 6b801349: Merge "Remove out-dated android-20 and android-21 now called android-L" into lmp-dev
* commit 'de2f9520b968eb1a678f564da15083c944181aa6':
2014-10-26 00:50:31 +00:00
Andrew Hsieh
7d8da750a6 am f0b763f1: am 076b3b27: am 5c0471db: am 3941c44f: Merge "Add support for x86 to hello-neon sample"
* commit 'f0b763f1b6857fb8337e00e8f7fb1ccfc3ca984c':
2014-10-26 00:50:27 +00:00
Andrew Hsieh
8e538a4b84 am c5f67d2d: am 6174c4c4: am 53a20e54: am a8c78c38: Merge "Refresh android-L headers/libs (WW37)"
* commit 'c5f67d2d0b022ebc3e2a97f3d239947c9c3ce195':
2014-10-26 00:50:23 +00:00
Chenjie Luo
9d91239a4d am b793668b: am 3b0ab876: Merge "Modify testrunner/test_defs.xml to delete obsolete cts tests" into lmp-dev
* commit 'b793668bd851c51ba1ff5ab3364bf5619404ea45':
2014-10-25 19:54:09 +00:00
Baligh Uddin
b026fa1ffc am 3bef59ab: (-s ours) am 3a39d4e2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '3bef59abfcd6fa48df33b36fb17960289b721f8c':
2014-10-25 19:54:08 +00:00
Baligh Uddin
fd23c3f1a2 am d5c6c1cd: (-s ours) am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE
* commit 'd5c6c1cdf729b9be5f54cdf9716e8e83e94d4629':
2014-10-25 19:54:07 +00:00
Xavier Ducrohet
824490c66c am f2dcbd2e: (-s ours) am 946bfb51: Update Build Tools version to <API>.0.1. DO NOT MERGE.
* commit 'f2dcbd2e72d4cd393a96d71457a14268e95b592a':
2014-10-25 19:54:06 +00:00
Trevor Johns
9e09cc9929 am cc763b72: am 36274ac5: Add additional samples for L to sdk.atree
* commit 'cc763b72d5d630c0212baf2f9536ac51dd068e19':
2014-10-25 19:54:02 +00:00