Commit Graph

16267 Commits

Author SHA1 Message Date
bohu
c01f2d390f Merge "Update system images to revision 3" into lmp-dev 2014-10-28 06:27:49 +00:00
Xavier Ducrohet
17d47a1072 am 5193f245: Merge "Update build tools version to 21.1.0. DO NOT MERGE." into lmp-dev
* commit '5193f245f5096b13c0ce99d1bf4473af1b86c4c8':
  Update build tools version to 21.1.0. DO NOT MERGE.
2014-10-28 06:22:28 +00:00
Takeshi Hagikura
5350100bbd am f6855153: Merge "resolved conflicts for merge of 3bb3da96 to lmp-dev" into lmp-dev
* commit 'f68551537c1011bb537abe0cf7cc817379c043a1':
2014-10-28 06:22:27 +00:00
Xavier Ducrohet
5193f245f5 Merge "Update build tools version to 21.1.0. DO NOT MERGE." into lmp-dev 2014-10-28 03:11:36 +00:00
Xavier Ducrohet
3ad4b1f733 Update build tools version to 21.1.0. DO NOT MERGE.
Change-Id: Ib3dc18f67dc26b157747db78f073d892d9a998f3
2014-10-27 20:10:52 -07:00
Takeshi Hagikura
f68551537c Merge "resolved conflicts for merge of 3bb3da96 to lmp-dev" into lmp-dev 2014-10-28 00:05:42 +00:00
Dake Gu
d18c4a82e0 Merge "SupportLeanbackDemo: show case of different image scale type" into lmp-mr1-dev 2014-10-27 20:36:00 +00:00
bohu
e66d37aa25 Update system images to revision 3
Update all the system images to revision 3.

Change-Id: If08e25423fd7680def47102c436162b1e544306f
2014-10-27 10:57:11 -07: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
Trevor Johns
34dd175908 am de236d16: am 6876a9cf: Add browseable samples for L SDK release
* commit 'de236d16d026140294b94744e2ee9a5dcac6f60a':
2014-10-25 19:53:58 +00:00
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