Commit Graph

17106 Commits

Author SHA1 Message Date
Tadashi G. Takaoka
005711eece am 8c59bd05: (-s ours) am 5838efd7: am 0d519132: (DO NOT MERGE) Fix SampleSpellCheckerService settings
* commit '8c59bd05a375268887327f883c44a70901043c08':
2015-03-22 00:32:15 +00:00
Elliott Hughes
47bf8a96fb am c2ccd62b: am a1344f79: am a8e31235: Add the arm64 pstate register to the stack tool.
* commit 'c2ccd62bd6537e74d4cc04e9914f25ed19980d50':
2015-03-22 00:32:12 +00:00
Elliott Hughes
cf9163211d am 97ea86bb: am 5283a536: am fbc66057: am 535decd2: Merge "Add the arm64 pstate register to the stack tool."
* commit '97ea86bb9e8268bac8fe0ee258fab4d3247510c7':
2015-03-22 00:32:08 +00:00
Jae Seo
fac40040ab am 7377480e: am ed47e4c0: am ca1c55b3: AtscInput: Add a dummy implementation of abstract onSetCaptionEnabled()
* commit '7377480e6a408dc695c6b7de961c8e81e2e12247':
2015-03-22 00:32:05 +00:00
Chet Haase
4dcbdc8fcd am c3d21f62: am a141244a: am dcabc1ac: Merge "Add RecyclerView animations for change actions"
* commit 'c3d21f621da15b5afb5e9f01ab67286a6713d754':
2015-03-22 00:32:02 +00:00
Ying Wang
3fbfda2621 am f27ae158: am 458970dd: am 4391853b: Fix win_sdk build.
* commit 'f27ae15805708eb2905663b14e5b11da938b2413':
2015-03-22 00:31:59 +00:00
Andrew Hsieh
97848100f2 am fdab103c: am 57a4cd15: am d163bd84: am 5d8817f5: am f22634e3: am 1d3c5d4b: am dd524f0c: Merge "Refresh 64-bit headers/libs (WW28)"
* commit 'fdab103ceea5a485bc8aefd0547d5814d44f44d6':
2015-03-22 00:31:56 +00:00
Andrew Hsieh
93befd9187 am 03eaa6a6: am d6de9175: am d749247c: am 70aad066: am e19c8d59: am e087f83a: am 26e306d9: Merge "Update mips64 lib-bootstrap"
* commit '03eaa6a6cb024cf15463f3e314fa4fef391c50a6':
2015-03-22 00:31:53 +00:00
Andrew Hsieh
479ad5e7d4 am 3c11b664: am cebae748: am f52b8c34: am 3eb82eca: am 1c7d5d11: am 344f76dc: am 630a1be4: Merge "Remove symlink lib-boostrap"
* commit '3c11b66433335d7895bf7d62b0989d5757c1b46a':
2015-03-22 00:31:48 +00:00
Leon Scroggins III
e37d39a20e am 71379d35: am 858d16f2: am c7095947: Call setShader after setLocalMatrix.
* commit '71379d35f81abf6b312f1e6ac5ac85b4c772a62f':
2015-03-22 00:31:42 +00:00
Deepanshu Gupta
6fc7fa4cda am b67b6609: am d38e53e9: am ba188a67: am 2c353e75: (-s ours) Update platform SDK component to L
* commit 'b67b660941577d1f4f426d47b2b43b0dc324b7a7':
2015-03-22 00:31:39 +00:00
Elliott Hughes
dad78f37c4 am 6bcba634: am fd12270b: am ae207056: am 95f5ef2a: am e72af215: am 8de48e23: Merge "Fix testrunner\'s reference to icu4c."
* commit '6bcba634651a94d688f2889aa261f1c1ef3980d2':
2015-03-22 00:31:33 +00:00
Tony Wickham
966e8455bc am fd83f008: am 8dd30e64: am 86d72d3c: am 39ae7d22: am 542963ee: Merge "Added _index.html and screenshots to all samples." into klp-modular-dev
* commit 'fd83f0086152668b14f05e7c7d9073e40415382c':
2015-03-22 00:31:27 +00:00
Deepanshu Gupta
d3ca9217b5 am 8a16585a: (-s ours) am 8788379a: am 52ec473f: am 9dabcc8d: (-s ours) am fc3efcd2: am d6ce63a3: am 6bd8a043: am fdafffee: (-s ours) am af01e43f: am 4564b18a: am 64d3ef3b: (-s ours) am e61fde7f: am bbfcdcc4: am 36b22516: Package renamed fonts. [DO NOT MERGE]
* commit '8a16585afa72714428f76d43c6782e7ea877c149':
2015-03-22 00:31:21 +00:00
Deepanshu Gupta
2fa3da07c7 am 5077dc91: (-s ours) am 176fbffd: am a3b0eda9: am 3eb60fc3: (-s ours) am e851bb15: am bc4103e3: am 17bed4f4: am 63527665: (-s ours) am 8a0254ee: am 618ccb2b: am 22779216: (-s ours) am 95ad5e38: am 36b22516: Package renamed fonts. [DO NOT MERGE]
* commit '5077dc91741b09b8590d5d02efb173085c96cc07':
2015-03-22 00:31:15 +00:00
Deepanshu Gupta
a3e40d6a2d am e7fc6902: (-s ours) am 45b4fa1b: am 6bfaf060: am b79abe56: (-s ours) am 6721a877: am 6aaa1ebb: am 2f5a06e4: am 1066b887: (-s ours) am 7ad693d1: am 35feaff4: Package renamed fonts. [DO NOT MERGE]
* commit 'e7fc6902ae3ae56fadfcf48ba24b37534cb342f0':
2015-03-22 00:31:07 +00:00
Dmitriy Ivanov
8d3904253a am 52f27abb: am 3f5034e0: am ba1f98e1: am 7a6c4e92: am 95c0db1e: am ce3b58a6: Merge "Update dlext.h header"
* commit '52f27abb8cf2ff95fef986fb21358d96e738e50a':
2015-03-22 00:30:59 +00:00
Chris Banes
d42f6fe091 am af6ed61d: am 0a09c0cc: am 170658dd: Update Support7Demos to include Palette demos
* commit 'af6ed61d7b88383cb506ba0ee77d5c21a6b3fcbe':
2015-03-22 00:30:52 +00:00
Andrew Hsieh
2950703e09 am bd5bc08e: am 21a0ffb4: am a29134d4: am f22634e3: am 1d3c5d4b: am dd524f0c: Merge "Refresh 64-bit headers/libs (WW28)"
* commit 'bd5bc08e0b489b760826b6673a8ae54a8feb420a':
2015-03-22 00:30:49 +00:00
Andrew Hsieh
bb43e5fe35 am 9d17f5bd: am 280f11d8: am 693fa5d8: am e19c8d59: am e087f83a: am 26e306d9: Merge "Update mips64 lib-bootstrap"
* commit '9d17f5bdbed8c46abf4a2406bcca8b71f341a7f2':
2015-03-22 00:30:40 +00:00
Andrew Hsieh
7cf21fcedf am 3f2e6c40: am 861a7ab9: am 45ac4eec: am 1c7d5d11: am 344f76dc: am 630a1be4: Merge "Remove symlink lib-boostrap"
* commit '3f2e6c40a0e48f20fa6692139e792623ff98d5d2':
2015-03-22 00:30:37 +00:00
Elliott Hughes
af56b7bc32 am 92b87afd: am a400d530: am e72af215: am 8de48e23: Merge "Fix testrunner\'s reference to icu4c."
* commit '92b87afd3de5b36253476e6245d29081cacd823b':
2015-03-22 00:30:34 +00:00
Dmitriy Ivanov
a6a071d2df am 3f57061c: am 859ffba8: am 95c0db1e: am ce3b58a6: Merge "Update dlext.h header"
* commit '3f57061cc797d55a5008cad458ae0ee61b9b7d08':
2015-03-22 00:30:29 +00:00
Geoff Mendal
d459f0ad6d Merge "Import translations. DO NOT MERGE" 2015-03-21 11:03:06 +00:00
Geoff Mendal
ec01b2f200 Import translations. DO NOT MERGE
Change-Id: Ic7184b89c152d64d174c3efc1136d39b4f8354a2
Auto-generated-cl: translation import
2015-03-21 02:20:39 -07:00
Geoff Mendal
6db630d8db Import translations. DO NOT MERGE
Change-Id: I7d32af81fdb48a4a5641fbdcb85b9012dbb29af4
Auto-generated-cl: translation import
2015-03-21 01:24:46 -05:00
Trevor Johns
7c7c2d49c3 am 34ebd03f: am 4b5d8355: am 6876a9cf: Add browseable samples for L SDK release
* commit '34ebd03fbcc122d2ade907e433e49b58cb462050':
2015-03-21 05:16:09 +00:00
Trevor Johns
8ffff7f9e8 am 84f0d412: am 4e09738a: am 66b6f721: Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev
* commit '84f0d412b6d1e379d296bc5e23cb5cc25ae5d30f':
2015-03-21 05:16:04 +00:00
Trevor Johns
33109b2ca9 am 339006dc: am 72687bd8: am ca8bc22a: sdk.atree: Fix typo and remove legacy BluetoothChat sample
* commit '339006dcbd4b15970b048bbf36f36db76fe0c14d':
2015-03-21 05:16:00 +00:00
Trevor Johns
e93187ca61 am 8dd5fc0f: am 70c55867: am d991bed6: Resolved conflicts for merge of \'9875ec66\' into lmp-dev
* commit '8dd5fc0f143058b3c56dbcc300f7c6f566dd5cbc':
2015-03-21 05:15:55 +00:00
Andrew Hsieh
b57554b086 am 16385db0: am 1305bed1: am c13cf09c: Merge "Add asm/a.out.h to arm64/mips/mips64"
* commit '16385db02a9d9a3c443ae224501a7f53fc772e23':
  Add asm/a.out.h to arm64/mips/mips64
2015-03-21 05:15:52 +00:00
Andrew Hsieh
ee4e746d78 am 2cd2f260: am 0b4823b9: am 4e47988f: Merge "Remove macros putc*/getc* from API<21 stdio.h to use"
* commit '2cd2f260747276a0f58ecd40edd5c5c3bd905ab1':
  Remove macros putc*/getc* from API<21 stdio.h to use
2015-03-21 05:15:49 +00:00
Andrew Hsieh
05d3b18900 am 11f8d20b: am 7a042ce4: am 9376f14e: Merge "Change sample native-codec\'s minSDK to android-21"
* commit '11f8d20b62a49077d06d5967a42d1597d89a5e41':
  Change sample native-codec's minSDK to android-21
2015-03-21 05:15:44 +00:00
Tadashi G. Takaoka
d4953245d8 am 3f6cd5d4: am 97f11e1c: (DO NOT MERGE) Fix sample SoftKeyboard preference activity
* commit '3f6cd5d4ab073e0eac4eecc4a5f656b14a67599a':
2015-03-21 05:15:39 +00:00
Neil Fuller
7c2255556c am b48e8788: am 29923a44: am a6e8e0d8: Merge "Remove dependencies on FloatMath"
* commit 'b48e8788934fde9669529a3785591b32ade978cd':
  Remove dependencies on FloatMath
2015-03-21 05:15:36 +00:00
Andrew Hsieh
e2a85f8bc3 am 14576ee4: am e6a62f60: am dc942b9c: Merge "Make memory_order_acquire visible in global namespace"
* commit '14576ee4b62f5b195d6676387898363e9b32c27e':
  Make memory_order_acquire visible in global namespace
2015-03-21 05:15:34 +00:00
Andrew Hsieh
2dfa93d344 am dcb2dcb7: am 0d879513: am 106046ae: Merge "Rename android-L to android-21"
* commit 'dcb2dcb74522046688a2003926a38d4f2cbfa84d':
  Rename android-L to android-21
2015-03-21 05:15:26 +00:00
Andrew Hsieh
995195513d am dcebc2f1: am 93dd2f8a: am b02b4bce: Merge "Add missing function prototypes in time.h"
* commit 'dcebc2f1d850c50c203417ee227833f3609c0c2c':
  Add missing function prototypes in time.h
2015-03-21 05:15:23 +00:00
Trevor Johns
8f9093ec36 am 030c8097: am 913f8146: am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev
* commit '030c8097527655dbbf10aa9f07d50c9975cb4ecb':
2015-03-21 05:15:21 +00:00
Chenjie Luo
7844784f7f am d47b5cee: am 9ac2afe4: am 88fbf1fe: Update test runner for cts tests in testrunner/test_defs.xml
* commit 'd47b5cee8212d41a546d332c7949468537c8aa03':
2015-03-21 05:15:19 +00:00
Tor Norbye
950cabd11c am 1181e941: am 3f75a9a0: am 3b2fe7eb: Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev
* commit '1181e941932c20cf5a7b7b284694a12942df563b':
2015-03-21 05:15:17 +00:00
Deepanshu Gupta
a8a9f14b3e am 9fabccbf: am e5a9f9d0: am 2c34d62a: Update LayoutLib API level to 12.
* commit '9fabccbf9b4ac7368dab77596c722b82accb8608':
2015-03-21 05:15:15 +00:00
Christopher Ferris
fed207e0ea am 8aa117a3: am 9329e4f0: am bb0d2060: Merge "Do not call art-on macro by default." into lmp-dev
* commit '8aa117a3b0f7a0c87830a09c73dc2e44c757ded1':
2015-03-21 05:15:13 +00:00
Tor Norbye
28f6763394 am de4255ab: am 7fb913fe: am 0eac39db: 17782530: Annotations using retention policy source remain in .class
* commit 'de4255ab85e9a3ff6d4addf550464dab8892d1b5':
2015-03-21 05:15:11 +00:00
Xavier Ducrohet
cc90e86ee0 am d36c4dd6: am 21af667f: am 3c0cd8cf: Merge "Package libc++.so in the build-tools." into lmp-dev
* commit 'd36c4dd6464e1bd8e7fb26d2fc638f63030bcaea':
2015-03-21 05:15:09 +00:00
Chris Banes
f5f6697dd1 am 711b2dc8: am cb838606: Merge "Update Support7Demos for L appcompat" into lmp-mr1-dev
* commit '711b2dc8c1ba0f583834fee8bbc9edd0885fe4aa':
2015-03-21 05:15:06 +00:00
Ruben Brunk
c65f5b312c am 4983e18f: am e5aa0f3f: runtest: Remove unused CtsTestStubs dependency.
* commit '4983e18f6cc22706ee14503247cecf7f7dc26112':
2015-03-21 05:15:04 +00:00
Yigit Boyar
589a179e14 am 0cc925e5: am 52af2550: Don\'t layout removed scrap views
* commit '0cc925e5dc9b80f1950e4a089133196e105056ee':
2015-03-21 05:15:02 +00:00
Narayan Kamath
f62caeb277 am d515d6c5: resolved conflicts for merge of 3f2caae2 to lmp-mr1-dev-plus-aosp
* commit 'd515d6c5c4979d5b4856f926187b834cf6b3cd35':
2015-03-21 05:14:59 +00:00
Andrew Hsieh
875ba275b2 am 991459db: am 4217c22d: am bb148d92: Merge "Refresh android-L headers (WW40)"
* commit '991459db7adec0626bfa2d5106f9cc548e007292':
  Refresh android-L headers (WW40)
2015-03-21 05:14:56 +00:00