Commit Graph

17118 Commits

Author SHA1 Message Date
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
Trevor Johns
eafc0ed990 am 33109b2c: am 339006dc: am 72687bd8: am ca8bc22a: sdk.atree: Fix typo and remove legacy BluetoothChat sample
* commit '33109b2ca92bc7c6a0b8bfae715cdd6b1e4c46d1':
2015-03-23 22:31:39 +00:00
Trevor Johns
b912b4abf0 am e93187ca: am 8dd5fc0f: am 70c55867: am d991bed6: Resolved conflicts for merge of \'9875ec66\' into lmp-dev
* commit 'e93187ca6182073d5d96ef7329f99f1aa25940f6':
2015-03-23 22:31:31 +00:00
Andrew Hsieh
f230a96558 am b57554b0: am 16385db0: am 1305bed1: am c13cf09c: Merge "Add asm/a.out.h to arm64/mips/mips64"
* commit 'b57554b086a68bca5eaf3bcc5f93ba52514fb27f':
2015-03-23 22:31:28 +00:00
Andrew Hsieh
9da11a8c71 am ee4e746d: am 2cd2f260: am 0b4823b9: am 4e47988f: Merge "Remove macros putc*/getc* from API<21 stdio.h to use"
* commit 'ee4e746d7844652078d4df7dd7ab24bc87a80938':
2015-03-23 22:31:24 +00:00
Andrew Hsieh
8727a565d4 am 05d3b189: am 11f8d20b: am 7a042ce4: am 9376f14e: Merge "Change sample native-codec\'s minSDK to android-21"
* commit '05d3b18900ec23577b665ac9a4d565287e866811':
2015-03-23 22:31:20 +00:00
Tadashi G. Takaoka
9ca8326b03 am d4953245: (-s ours) am 3f6cd5d4: am 97f11e1c: (DO NOT MERGE) Fix sample SoftKeyboard preference activity
* commit 'd4953245d8a38c7f31d10b35d76d95b4d1db0b9f':
2015-03-23 22:31:18 +00:00
Neil Fuller
8206159211 am 7c225555: am b48e8788: am 29923a44: am a6e8e0d8: Merge "Remove dependencies on FloatMath"
* commit '7c2255556c5136c3dc09a746c9a00e28efc660e7':
2015-03-23 22:31:15 +00:00
Andrew Hsieh
8578c48e07 am e2a85f8b: am 14576ee4: am e6a62f60: am dc942b9c: Merge "Make memory_order_acquire visible in global namespace"
* commit 'e2a85f8bc35099a7953091bda62af076c71a6b5f':
2015-03-23 22:31:10 +00:00
Andrew Hsieh
323a5ab45c am 2dfa93d3: am dcb2dcb7: am 0d879513: am 106046ae: Merge "Rename android-L to android-21"
* commit '2dfa93d344423a2195ce240938af7d4e8d2af61f':
2015-03-23 22:31:07 +00:00
Andrew Hsieh
3d6bc93500 am 99519551: am dcebc2f1: am 93dd2f8a: am b02b4bce: Merge "Add missing function prototypes in time.h"
* commit '995195513df95db1afb4d359b0c6ce467c3e809d':
2015-03-23 22:31:05 +00:00
Trevor Johns
4906d679ba am 8f9093ec: am 030c8097: am 913f8146: am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev
* commit '8f9093ec36a8a8bb768d5e85df3ef12a265b5db7':
2015-03-23 22:31:02 +00:00
Chenjie Luo
5b9147bde1 am 7844784f: am d47b5cee: am 9ac2afe4: am 88fbf1fe: Update test runner for cts tests in testrunner/test_defs.xml
* commit '7844784f7f33a51bafd744b314a617b38d522c23':
2015-03-23 22:30:59 +00:00
Tor Norbye
8dfddfb9eb am 950cabd1: am 1181e941: am 3f75a9a0: am 3b2fe7eb: Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev
* commit '950cabd11cee24b091aa043cf072ceb4dc4f418b':
2015-03-23 22:30:56 +00:00
Deepanshu Gupta
9a6f74c076 am a8a9f14b: am 9fabccbf: am e5a9f9d0: am 2c34d62a: Update LayoutLib API level to 12.
* commit 'a8a9f14b3e5834eebdb6103339a92ce78c322435':
2015-03-23 22:30:53 +00:00
Christopher Ferris
af5a64a4a0 am fed207e0: am 8aa117a3: am 9329e4f0: am bb0d2060: Merge "Do not call art-on macro by default." into lmp-dev
* commit 'fed207e0ea9928ae1f22b8e6db813473229a653a':
2015-03-23 22:30:50 +00:00
Tor Norbye
05fed29d13 am 28f67633: am de4255ab: am 7fb913fe: am 0eac39db: 17782530: Annotations using retention policy source remain in .class
* commit '28f6763394034080dd6cabf7222992e94d66749b':
2015-03-23 22:30:45 +00:00
Xavier Ducrohet
bc18e963f8 am cc90e86e: am d36c4dd6: am 21af667f: am 3c0cd8cf: Merge "Package libc++.so in the build-tools." into lmp-dev
* commit 'cc90e86ee0539863f9cdb9cb071ae690937e5ce7':
2015-03-23 22:30:43 +00:00
Chris Banes
43120cb780 am f5f6697d: am 711b2dc8: am cb838606: Merge "Update Support7Demos for L appcompat" into lmp-mr1-dev
* commit 'f5f6697dd15b8e3dc4955604038e784b5834f6cf':
2015-03-23 22:30:40 +00:00
Ruben Brunk
94d25ee199 am c65f5b31: am 4983e18f: am e5aa0f3f: runtest: Remove unused CtsTestStubs dependency.
* commit 'c65f5b312ceebb747b1d6c181c79e42d6a91147c':
2015-03-23 22:30:37 +00:00
Yigit Boyar
ee27c80cec am 589a179e: am 0cc925e5: am 52af2550: Don\'t layout removed scrap views
* commit '589a179e14a972ba8b3f3ee7463da4e7a98c781b':
2015-03-23 22:30:32 +00:00
Narayan Kamath
d7f38c554f am f62caeb2: am d515d6c5: resolved conflicts for merge of 3f2caae2 to lmp-mr1-dev-plus-aosp
* commit 'f62caeb2775fc20a215e9406971945c72f766552':
2015-03-23 22:30:26 +00:00
Andrew Hsieh
5c7b39f455 am 875ba275: am 991459db: am 4217c22d: am bb148d92: Merge "Refresh android-L headers (WW40)"
* commit '875ba275b218afc9e9b86158fc0b87a8589e4f86':
2015-03-23 22:30:20 +00:00
Dake Gu
239d2c1ac1 am 5b445be5: am 6768d21f: am 221b154a: SupportLeanbackDemo: Fix crash of launch Detail from Search
* commit '5b445be56e4e9e0611b262061d6187a1ac3e0db9':
2015-03-23 22:30:14 +00:00
Andrew Hsieh
6b7afabce3 am a9656cb7: am 027f2aff: am 1978baa1: am ec2d5674: Merge "Bump up clang vesion accepting __builtin_isnan __attribute__((pcs("aapcs")))"
* commit 'a9656cb76ec7f159c05b66856209252c9df2eb92':
2015-03-23 22:30:09 +00:00
Andrew Hsieh
2a0f0cab4a am ee31e610: am 1a9fba3c: am f5ad59d4: am 154cb254: Merge "Add posix_memalign to libc.so for API 17,18,19"
* commit 'ee31e6100923c4298b9ece1faf54fb602541419e':
2015-03-23 22:30:03 +00:00
Andrew Hsieh
1e4a181095 am f68369a2: am d3df9917: am 132945b9: am c316a240: Merge "Added sys/ucontext.h and sys/user.h to all API levels."
* commit 'f68369a2603fa3189be1c305459133a05ae083a1':
2015-03-23 22:29:57 +00:00
Dan Albert
f71a803180 am 4f6e6083: am 7baaba83: am 9bc92deb: am 20d16a75: Merge "Silence lcov existence test output."
* commit '4f6e60833d0f60eda016049eb24f28e864fbfadb':
2015-03-23 22:29:50 +00:00
Xavier Ducrohet
10ab32f726 am d1d28519: am 489fb042: am 91909fae: Prepare the SDK component version numbers.
* commit 'd1d28519ae0159ac3ba7bf03e909af711cc6bca6':
2015-03-23 22:29:42 +00:00
Dan Albert
ecc1dea904 am 33512044: am b8fb935f: am cbe2394e: am 217d230a: Merge "Add acov for coverage gathering/reporting."
* commit '33512044f20170fc987fe72527ca1d3be616bafe':
2015-03-23 22:29:34 +00:00
Andrew Hsieh
85cf6db7f2 am a9c09642: am 04c78d5c: am 04df6b31: am eef4aba8: Merge "Add missing posix_memalign function in x86 libc.so.functions.txt. (See b.android.com/28834)"
* commit 'a9c096426652906c5df1ae96b95659b71f487895':
2015-03-23 22:29:28 +00:00
Dake Gu
383377f13c am 54226208: am c702bbe0: am 7c4d38c4: SupportLeanbackDemo: dont override fragment\'s object from activity
* commit '54226208af6c38bdeeb0c2e2e82db686aa0cc282':
2015-03-23 22:29:24 +00:00
Dake Gu
3c7d4586f2 am 4950cef1: am b7613fed: am 7c6a3e4f: Merge "Use image card view for DetailsFragment example" into lmp-dev
* commit '4950cef14eb717b51ceb9c7c3caab64547e26240':
2015-03-23 22:29:21 +00:00
Craig Stout
9a3d65a9b1 am db774556: am f5417d29: am a0f2a8db: Fix build.
* commit 'db77455674e57b5c61b92dcb9c58de926494037f':
2015-03-23 22:29:17 +00:00
Craig Stout
775ff4e8a1 am 7d9eb7d5: am 4d42aeb8: am 76d6eba7: Use new callback for search by intent.
* commit '7d9eb7d59da7219f282b681e45528a32d6db2113':
2015-03-23 22:29:12 +00:00
Siva Velusamy
f3819b5de0 am ab17ec93: am 3267c269: am bd2bea18: Update revision of Android SDK USB driver for Windows
* commit 'ab17ec93f77ca51d5c484915723c5f4ce9aba7c4':
2015-03-23 22:29:09 +00:00
Siva Velusamy
ebc04b3923 am 76037a92: am 8f068d84: am 6ae0b776: Android SDK Windows USB driver: Project Tango pid
* commit '76037a92c24b14201323a6c08884d9a274f3d7e0':
2015-03-23 22:29:06 +00:00
Andrew Hsieh
82a3919b55 am 2892773f: am 7b5283a5: am 6b801349: Merge "Remove out-dated android-20 and android-21 now called android-L" into lmp-dev
* commit '2892773f1c908b132258f813618b63c7dfd5bdfb':
2015-03-23 22:29:03 +00:00
Andrew Hsieh
8288dd960e am bb08ff61: am 014f981b: am 726f6d87: am 5b664707: Merge "Bugfix for libportable to make compile happy."
* commit 'bb08ff6175a191503293a5796c71300f45bdf28c':
2015-03-23 22:29:00 +00:00
Andrew Hsieh
3436f5a206 am db803855: am e72d8800: am 5c0471db: am 3941c44f: Merge "Add support for x86 to hello-neon sample"
* commit 'db803855f5446413cb3e8c7d3d9ed824aa6e3853':
2015-03-23 22:28:58 +00:00
Andrew Hsieh
adb22721eb am f51a03c2: am 8707b139: am 53a20e54: am a8c78c38: Merge "Refresh android-L headers/libs (WW37)"
* commit 'f51a03c2c91e47be3c57f08dd97b3e5e0e129ae4':
2015-03-23 22:28:53 +00:00
Tyler Gunn
06aca79945 am cac75b85: am a6efa2eb: am 2e4aa794: Renaming Telecomm to Telecom.
* commit 'cac75b858da761a40e92b630e137db5e5cf27bf2':
2015-03-23 22:28:50 +00:00
Cheuksan Wang
4c71c0149d am 82fe2270: am f5a2be77: am 33fe444f: Merge "Send and download MMS via content provider instead of PDU bytes." into lmp-dev
* commit '82fe2270df18d0c5b44950443399d47b5fe9426a':
2015-03-23 22:28:47 +00:00