Commit Graph

15695 Commits

Author SHA1 Message Date
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
Sky Faber
496d451c96 am a5d6afdc: am 2247b043: DO NOT MERGE: idegen: Skip directories named *.java when parsing source.
* commit 'a5d6afdcbd2d26a88a06d27a543291c07b9257cc':
  DO NOT MERGE: idegen: Skip directories named *.java when parsing source.
2014-10-24 18:30:20 +00:00
Sky Faber
a5d6afdcbd am 2247b043: DO NOT MERGE: idegen: Skip directories named *.java when parsing source.
* commit '2247b043df5086e285ec4192a8d79a3d9b6c1045':
  DO NOT MERGE: idegen: Skip directories named *.java when parsing source.
2014-10-24 18:26:34 +00:00
Sky Faber
2247b043df DO NOT MERGE: idegen: Skip directories named *.java when parsing source.
Change-Id: I8a6700ebcc198851b80de4832a43d147dc887f3a
(cherry picked from commit e83d6400fb)
2014-10-24 18:20:36 +00:00
Trevor Johns
bd48d1e676 am 05ef7f04: DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)
* commit '05ef7f04976081f8d2421b579c813c4ade72bbd2':
  DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)
2014-10-24 06:52:13 +00:00
Takeshi Hagikura
3bb3da96ae resolved conflicts for merge of 11e09fc0 to klp-modular-dev
Extracted the diff for those files between klp-modular-docs and klp-modular-dev in case
https://paste.googleplex.com/5232937083600896

Change-Id: I94950ba66f15b75c1ead60e9f6b38b67e4fa9d6e
2014-10-24 01:39:19 +00:00
Trevor Johns
8afef9e7f9 am 72f065ea: am 7876b306: am baf6829e: am f420ff0d: Add browseable samples for Clockwork Beryl
* commit '72f065ea165f8a39801e8ab4af8e7ec6b32109d5':
  Add browseable samples for Clockwork Beryl
2014-10-23 15:58:59 +00:00
Trevor Johns
72f065ea16 am 7876b306: am baf6829e: am f420ff0d: Add browseable samples for Clockwork Beryl
* commit '7876b306a2390130255b0aea6e10ef574bcabc2d':
  Add browseable samples for Clockwork Beryl
2014-10-23 08:04:38 +00:00
Trevor Johns
7876b306a2 am baf6829e: am f420ff0d: Add browseable samples for Clockwork Beryl
* commit 'baf6829eecf4889f38fb9d75d1c61392d13b3bd0':
  Add browseable samples for Clockwork Beryl
2014-10-23 07:58:27 +00:00
Trevor Johns
baf6829eec am f420ff0d: Add browseable samples for Clockwork Beryl
* commit 'f420ff0d80e9e44e1744602e832d29563d28312d':
  Add browseable samples for Clockwork Beryl
2014-10-23 07:55:07 +00:00
Trevor Johns
f420ff0d80 Add browseable samples for Clockwork Beryl
Bug: 17473824
Change-Id: Id4c637733c491ac71bb6e269f55939c082fb0994
2014-10-23 03:36:38 +00:00
Joe Fernandez
d9475320a4 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 '939f4bfd9e48ca6df77652c5cb02374e4e8c6a8d':
  DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)
2014-10-22 21:51:53 +00:00
Joe Fernandez
939f4bfd9e am 3cbcd20f: am f43722b7: am 4a5ce9ae: Merge "DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)" into lmp-dev
* commit '3cbcd20f330527eaf9af679d5db850919100c4f6':
  DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)
2014-10-22 21:48:20 +00:00
Joe Fernandez
cd7097298d 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.google.com/56460
* commit '35828e85bbb1a58d4dde4caef35d506b8ecde1b1':
  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-22 21:47:10 +00:00
Joe Fernandez
773435f9f0 am e054c2b3: am 705a1bb4: am d42d6553: am c789ef84: Merge "sdk.atree: Move JobScheduler sample from \'ui/views\' to \'background\'" into lmp-dev
* commit 'e054c2b35ffcfe643107d65073b6615fde7af828':
  sdk.atree: Move JobScheduler sample from 'ui/views' to 'background'
2014-10-22 21:46:58 +00:00
Joe Fernandez
3cbcd20f33 am f43722b7: am 4a5ce9ae: Merge "DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)" into lmp-dev
* commit 'f43722b7733243e79149b19a0635af572c79b3e3':
  DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)
2014-10-22 21:44:55 +00:00
Joe Fernandez
35828e85bb 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.google.com/564608)" into lmp-
* commit 'db9b560e19ec4faee00523b350ee54e798da14df':
  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-22 21:40:50 +00:00
Joe Fernandez
e054c2b35f am 705a1bb4: am d42d6553: am c789ef84: Merge "sdk.atree: Move JobScheduler sample from \'ui/views\' to \'background\'" into lmp-dev
* commit '705a1bb476b9f46a75ae8a90b718f875942364e8':
  sdk.atree: Move JobScheduler sample from 'ui/views' to 'background'
2014-10-22 21:40:49 +00:00
Joe Fernandez
db9b560e19 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.google.com/564608)" into lmp-dev
* commit 'd74a44da81602b1f36123a37d3b721288afde384':
  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-22 21:34:28 +00:00
Joe Fernandez
705a1bb476 am d42d6553: am c789ef84: Merge "sdk.atree: Move JobScheduler sample from \'ui/views\' to \'background\'" into lmp-dev
* commit 'd42d655323dadec6c846169ea99f4e06ba123495':
  sdk.atree: Move JobScheduler sample from 'ui/views' to 'background'
2014-10-22 21:34:26 +00:00
Joe Fernandez
f43722b773 am 4a5ce9ae: Merge "DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)" into lmp-dev
* commit '4a5ce9aedf40ca1de18eafd2e63d31c6d5b63834':
  DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)
2014-10-22 20:34:42 +00:00
Joe Fernandez
d74a44da81 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.google.com/564608)" into lmp-dev
* commit 'de3f94a00075fa1c24ac66db2e8c743bd9f46eed':
  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-22 20:29:19 +00:00
Joe Fernandez
d42d655323 am c789ef84: Merge "sdk.atree: Move JobScheduler sample from \'ui/views\' to \'background\'" into lmp-dev
* commit 'c789ef844ba501e0d5fc5ae4a429a104541f24ff':
  sdk.atree: Move JobScheduler sample from 'ui/views' to 'background'
2014-10-22 20:29:17 +00:00
Joe Fernandez
4a5ce9aedf Merge "DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)" into lmp-dev 2014-10-22 20:28:57 +00:00
Trevor Johns
08e81c8099 DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)
Change-Id: Ice64270da1cb79985615623a03a7783a580211ce
2014-10-22 20:28:48 +00:00
Trevor Johns
05ef7f0497 DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)
Change-Id: I70b64fc852a9ebd63acd0eca352988f63210b7dd
2014-10-22 20:28:20 +00:00