Commit Graph

15802 Commits

Author SHA1 Message Date
Trevor Johns
cfec1532dc am e3e839e5: am 66b6f721: Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev
* commit 'e3e839e52b757b29da2674a4cebbb2969c977959':
2014-10-25 19:53:54 +00:00
Trevor Johns
6bf079a32f am 8176b906: am ca8bc22a: sdk.atree: Fix typo and remove legacy BluetoothChat sample
* commit '8176b9067fcd0f15d331c007905f165a5966d617':
2014-10-25 19:53:50 +00:00
Trevor Johns
12c9391bc7 am 3beb9eae: am d991bed6: Resolved conflicts for merge of \'9875ec66\' into lmp-dev
* commit '3beb9eae9a43c579a376b4256e07ff97852ed258':
2014-10-25 19:53:46 +00:00
Andrew Hsieh
220869bbd6 am d10b06eb: am 1305bed1: am c13cf09c: Merge "Add asm/a.out.h to arm64/mips/mips64"
* commit 'd10b06ebe3300abfacb4b85f9a2466d798e3a947':
2014-10-25 19:53:44 +00:00
Andrew Hsieh
8d9384e23e am 10efbc14: am 0b4823b9: am 4e47988f: Merge "Remove macros putc*/getc* from API<21 stdio.h to use"
* commit '10efbc1461e264b50772c4ab87f99d8ce4a7d610':
2014-10-25 19:53:43 +00:00
Andrew Hsieh
9fe3045fe1 am 2f5539a4: am 7a042ce4: am 9376f14e: Merge "Change sample native-codec\'s minSDK to android-21"
* commit '2f5539a4eb682e0ad9b44641f5d98af0d97fed9a':
2014-10-25 19:53:41 +00:00
Neil Fuller
09ac46eeed am 29329726: am 29923a44: am a6e8e0d8: Merge "Remove dependencies on FloatMath"
* commit '29329726c3b30991378b9d5e376db57a572ede38':
2014-10-25 19:53:40 +00:00
Andrew Hsieh
ad8bbae857 am d6bf7265: am e6a62f60: am dc942b9c: Merge "Make memory_order_acquire visible in global namespace"
* commit 'd6bf7265b3ca03a97b9f14d477dbd8db6889d4e7':
2014-10-25 19:53:38 +00:00
Andrew Hsieh
f5a01d4e74 am 64724bcc: am 0d879513: am 106046ae: Merge "Rename android-L to android-21"
* commit '64724bcca345c0b89bfc0ebd7b6fb2d1c7e9ca96':
2014-10-25 19:53:36 +00:00
Andrew Hsieh
5e8eedd60e am 2a01c3f3: am 93dd2f8a: am b02b4bce: Merge "Add missing function prototypes in time.h"
* commit '2a01c3f3f9a4b1a751c95617ddec17e92520440a':
2014-10-25 19:53:34 +00:00
Trevor Johns
a9bf79464c am 85e87c55: am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev
* commit '85e87c555a98bb327219b2bd3a34e4e6a2137cfe':
2014-10-25 19:53:33 +00:00
Chenjie Luo
af09226b38 am 950879ac: am 88fbf1fe: Update test runner for cts tests in testrunner/test_defs.xml
* commit '950879ac33b76d0fb8d7cfc8787161bd28fd932a':
2014-10-25 19:53:32 +00:00
Tor Norbye
e2b1e75f19 am 3fa7b69d: am 3b2fe7eb: Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev
* commit '3fa7b69db654c0f754797c762eaf17c64d1abd43':
2014-10-25 19:53:30 +00:00
Deepanshu Gupta
512358bf86 am e1a3f47e: am 2c34d62a: Update LayoutLib API level to 12.
* commit 'e1a3f47e5e2c178219ff4b7d9367d04428ec2ba2':
2014-10-25 19:53:29 +00:00
Christopher Ferris
415606056c am de394866: am bb0d2060: Merge "Do not call art-on macro by default." into lmp-dev
* commit 'de3948664086ebdb61f8eba02597925805633d65':
2014-10-25 19:53:27 +00:00
Tor Norbye
2a279e6267 am a22d6f70: am 0eac39db: 17782530: Annotations using retention policy source remain in .class
* commit 'a22d6f7077071e5fc32bb623c338bdd9c09c47e0':
2014-10-25 19:53:26 +00:00
Xavier Ducrohet
6f0ed4fc66 am cb002a83: am 3c0cd8cf: Merge "Package libc++.so in the build-tools." into lmp-dev
* commit 'cb002a83be617ac906514076dc1dc306d0236e5d':
2014-10-25 19:53:25 +00:00
Ruben Brunk
a0f3d46986 am f431341c: am e5aa0f3f: runtest: Remove unused CtsTestStubs dependency.
* commit 'f431341c3f4a2e4c6ca1e5ed910b22145d2a9231':
2014-10-25 19:53:23 +00:00
Yigit Boyar
ef4e2cb02e am 5ea5cc3d: am 52af2550: Don\'t layout removed scrap views
* commit '5ea5cc3d8e8a21fed374f48ad6171e8713be2372':
2014-10-25 19:53:22 +00:00
Stephen Hines
2b36e2928b am 513c112f: resolved conflicts for merge of 3f2caae2 to lmp-dev-plus-aosp
* commit '513c112f912494bc81336149014403e65c9ab1d3':
2014-10-25 19:53:04 +00:00
Andrew Hsieh
82835cc04e am 4981bc73: am 4217c22d: am bb148d92: Merge "Refresh android-L headers (WW40)"
* commit '4981bc731888a803a5c6177c2cdebfd2be4d889f':
2014-10-25 19:53:03 +00:00
Dake Gu
999496fe37 am 671225a1: am 221b154a: SupportLeanbackDemo: Fix crash of launch Detail from Search
* commit '671225a12adcbc893c0874bce50cbca685eb9999':
2014-10-25 19:53:01 +00:00
Andrew Hsieh
dbfc578f8a am 3dc64520: am 1978baa1: am ec2d5674: Merge "Bump up clang vesion accepting __builtin_isnan __attribute__((pcs("aapcs")))"
* commit '3dc645207674fba084c582b44f9d7d1e70803b63':
2014-10-25 19:53:00 +00:00
Andrew Hsieh
c543f0def1 am a428c4d6: am f5ad59d4: am 154cb254: Merge "Add posix_memalign to libc.so for API 17,18,19"
* commit 'a428c4d6f24a0c12f0e258b33f94bd4f823b0fa1':
2014-10-25 19:52:58 +00:00
Andrew Hsieh
d0e5f3539a am 7d27bb77: am 132945b9: am c316a240: Merge "Added sys/ucontext.h and sys/user.h to all API levels."
* commit '7d27bb77967d785d8ef0da46e292765eb802dec8':
2014-10-25 19:52:57 +00:00
Dan Albert
58b157f456 am 48a1ff86: am 9bc92deb: am 20d16a75: Merge "Silence lcov existence test output."
* commit '48a1ff8685921f7f22dcd4ade2a39de8d4d63300':
2014-10-25 19:52:56 +00:00
Xavier Ducrohet
c4f43d23e0 am 8439bda6: am 91909fae: Prepare the SDK component version numbers.
* commit '8439bda6b0f09382789981a8ab3cc27f14eeed39':
2014-10-25 19:52:55 +00:00
Dan Albert
4876083de6 am f9026b36: am cbe2394e: am 217d230a: Merge "Add acov for coverage gathering/reporting."
* commit 'f9026b3669aa3da8e913e7076ea7d89f300a129e':
2014-10-25 19:52:53 +00:00
Andrew Hsieh
cf8c593917 am 7ab39b2a: am 04df6b31: am eef4aba8: Merge "Add missing posix_memalign function in x86 libc.so.functions.txt. (See b.android.com/28834)"
* commit '7ab39b2a637df56c5a2ad28aee38e8e2749fa6e9':
2014-10-25 19:52:52 +00:00
Dake Gu
2d0be53e87 am 0b5fedbd: am 7c4d38c4: SupportLeanbackDemo: dont override fragment\'s object from activity
* commit '0b5fedbd68e3fa28cf1c94fc4607e65325667f29':
2014-10-25 19:52:50 +00:00
Dake Gu
7ff194b3eb am 7bacdb31: am 7c6a3e4f: Merge "Use image card view for DetailsFragment example" into lmp-dev
* commit '7bacdb314fc8dadd7ce45f3d2e1d1aeab7a4d57d':
2014-10-25 19:52:49 +00:00
Andrew Hsieh
7e78cb836c am 0a8ec948: am 726f6d87: am 5b664707: Merge "Bugfix for libportable to make compile happy."
* commit '0a8ec948117c5b353a08f835f56dc9de93842dc6':
2014-10-25 19:52:47 +00:00
Craig Stout
63892f932c am d50f3f06: am a0f2a8db: Fix build.
* commit 'd50f3f06d4d53e3e1c1cfc9cdcdd6a5da36be216':
2014-10-25 19:52:46 +00:00
Craig Stout
20e5f5b863 am bd1630f9: am 76d6eba7: Use new callback for search by intent.
* commit 'bd1630f90a938d95ae1b48cf7c43b1a7034b39f2':
2014-10-25 19:52:44 +00:00
Siva Velusamy
39781ab591 am bb5620c6: am bd2bea18: Update revision of Android SDK USB driver for Windows
* commit 'bb5620c689aeebc6374c9a97f764939cd068b928':
2014-10-25 19:52:42 +00:00
Siva Velusamy
f63490677b am 715dcb37: am 6ae0b776: Android SDK Windows USB driver: Project Tango pid
* commit '715dcb371208b6323311ebf27a8405607cbcbf4a':
2014-10-25 19:52:40 +00:00
Andrew Hsieh
de2f9520b9 am 4d8856da: am 6b801349: Merge "Remove out-dated android-20 and android-21 now called android-L" into lmp-dev
* commit '4d8856da3639d6bd967d25fc67ee3821bd471734':
2014-10-25 19:52:38 +00:00
Andrew Hsieh
f0b763f1b6 am 076b3b27: am 5c0471db: am 3941c44f: Merge "Add support for x86 to hello-neon sample"
* commit '076b3b27fc0e6935c01fcbcc3c137bafeff609d9':
2014-10-25 19:52:35 +00:00
Andrew Hsieh
c5f67d2d0b am 6174c4c4: am 53a20e54: am a8c78c38: Merge "Refresh android-L headers/libs (WW37)"
* commit '6174c4c43710a29fea752e0cf99356c6e40bea74':
2014-10-25 19:52:32 +00:00
Trevor Johns
f9f445e673 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 'a819c32dcb93a4e681473578771e3e90fb3f847a':
  DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)
2014-10-24 23:49:20 +00:00
Takeshi Hagikura
7eb30d83f1 am 91655c8f: am 41465421: am 15677158: am 96c8509e: am 3bb3da96: (-s ours) resolved conflicts for merge of 11e09fc0 to klp-modular-dev
* commit '91655c8f79720cdc30c45f486f7f75806b7ea8a8':
  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.google.com/564608)
2014-10-24 23:49:18 +00:00
Trevor Johns
a819c32dcb 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 'ca4362bc81e8bef2820536a2b552dea8d383b4d1':
  DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)
2014-10-24 23:41:32 +00:00
Takeshi Hagikura
91655c8f79 am 41465421: am 15677158: am 96c8509e: am 3bb3da96: (-s ours) resolved conflicts for merge of 11e09fc0 to klp-modular-dev
* commit '41465421296619974efea860a349102b9f31ebfa':
  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.google.com/564608)
2014-10-24 23:41:26 +00:00
Trevor Johns
ca4362bc81 am a916086f: am 5aad4e45: am bd48d1e6: (-s ours) am 05ef7f04: DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)
* commit 'a916086fe96df0e26c7ca364c221b3aaa12f3d69':
  DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)
2014-10-24 23:28:10 +00:00
Takeshi Hagikura
4146542129 am 15677158: am 96c8509e: am 3bb3da96: (-s ours) resolved conflicts for merge of 11e09fc0 to klp-modular-dev
* commit '156771586a8329c581657c764266a94e4dd47d7f':
  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.google.com/564608)
2014-10-24 23:28:09 +00:00
Trevor Johns
a916086fe9 am 5aad4e45: am bd48d1e6: (-s ours) am 05ef7f04: DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)
* commit '5aad4e45d0e6666eec865ac7277406f97da02095':
  DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)
2014-10-24 23:04:42 +00:00
Takeshi Hagikura
156771586a am 96c8509e: am 3bb3da96: (-s ours) resolved conflicts for merge of 11e09fc0 to klp-modular-dev
* commit '96c8509e4ad462d79f5323619c77b7b7174f4ca5':
  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.google.com/564608)
2014-10-24 23:04:41 +00:00
Trevor Johns
5aad4e45d0 am bd48d1e6: (-s ours) am 05ef7f04: DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)
* commit 'bd48d1e676d23f8f6ff9b57d1a92e4b3935bfecc':
  DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)
2014-10-24 22:27:48 +00:00
Takeshi Hagikura
96c8509e4a am 3bb3da96: (-s ours) resolved conflicts for merge of 11e09fc0 to klp-modular-dev
* commit '3bb3da96ae60f6e1f1a9fef32c428a92b104c2cd':
  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.google.com/564608)
2014-10-24 22:14:50 +00:00
Adam Lesinski
42aa7939a6 Enable building gtest for Windows
Change-Id: Ib4a865ca7716084498eff32e057865c0ffbced46
2014-10-24 18:40:35 +00:00