LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,747 Commits 2 Branches 0 Tags
21c4a88a26c79c7a970ca0fd01e635ce82dd82a6
Commit Graph

16747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dake Gu
99cf1af3c1 am 455a4c3f: Merge "SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace()" into lmp-mr1-dev 
* commit '455a4c3f915bce079ca2aceb4fc30b2f6c44dd14':
  SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace()
 2014-10-28 22:33:08 +00:00
Dake Gu
455a4c3f91 Merge "SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace()" into lmp-mr1-dev 2014-10-28 22:27:57 +00:00
Dake Gu
b43b47c6d3 SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace() 
b/17893479

Change-Id: Iaf91ba1ebca1237fc0d2d5629e0c2e83e15d54a0
 2014-10-28 15:25:40 -07:00
Dake Gu
7fd4f541c8 am 1554fa43: am 1eaf20c6: am d18c4a82: Merge "SupportLeanbackDemo: show case of different image scale type" into lmp-mr1-dev 
* commit '1554fa43394d1effd2abd13183b57808ec8b3bbc':
  SupportLeanbackDemo: show case of different image scale type
 2014-10-28 20:35:26 +00:00
Dake Gu
1554fa4339 am 1eaf20c6: am d18c4a82: Merge "SupportLeanbackDemo: show case of different image scale type" into lmp-mr1-dev 
* commit '1eaf20c653e3223be91774687f5249229693bffd':
  SupportLeanbackDemo: show case of different image scale type
 2014-10-28 20:29:43 +00:00
Xavier Ducrohet
9ccbed2191 am 86d28ad8: Add jack/jill/multidex lib to build-tools. 
* commit '86d28ad8c192084fea8926a56fec732d99cfcdbc':
  Add jack/jill/multidex lib to build-tools.
 2014-10-28 20:11:55 +00:00
Xavier Ducrohet
86d28ad8c1 Add jack/jill/multidex lib to build-tools. 
Change-Id: Id8aad3a7ea808c5b2d1dd5c008f6202aefb7ef3b
 2014-10-28 12:06:50 -07:00
Adam Lesinski
23dfdd0984 am 56fd4241: Merge "Enable building gtest for Windows" into lmp-mr1-dev 
* commit '56fd4241e6cdf9af750e18d36900b7b8552ff45f':
  Enable building gtest for Windows
 2014-10-28 17:45:08 +00:00
Adam Lesinski
56fd4241e6 Merge "Enable building gtest for Windows" into lmp-mr1-dev 2014-10-28 17:41:47 +00:00
Dake Gu
1eaf20c653 am d18c4a82: Merge "SupportLeanbackDemo: show case of different image scale type" into lmp-mr1-dev 
* commit 'd18c4a82e0a9837301436411867ca56bfed3a36f':
  SupportLeanbackDemo: show case of different image scale type
 2014-10-28 07:11:41 +00:00
bohu
ccaaeb5f25 am c01f2d39: Merge "Update system images to revision 3" into lmp-dev 
* commit 'c01f2d390fab6f51f1a9619daea6699521e3a679':
  Update system images to revision 3
 2014-10-28 06:31:57 +00:00
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
e589ead76b am 9d91239a: am b793668b: am 3b0ab876: Merge "Modify testrunner/test_defs.xml to delete obsolete cts tests" into lmp-dev 
* commit '9d91239a4da7dabeed034043d67c1eee6e9d3598':
 2014-10-26 00:51:32 +00:00
Baligh Uddin
7ad7dee0ff am b026fa1f: (-s ours) am 3bef59ab: (-s ours) am 3a39d4e2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'b026fa1ffcbcc97ecc609213a3e7b729591fb67d':
 2014-10-26 00:51:31 +00:00
Baligh Uddin
75cee6db27 am fd23c3f1: (-s ours) am d5c6c1cd: (-s ours) am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE 
* commit 'fd23c3f1a2e33bde9f1e0312a37f20aafd291d9c':
 2014-10-26 00:51:30 +00:00
Xavier Ducrohet
37dd47616b am 824490c6: (-s ours) am f2dcbd2e: (-s ours) am 946bfb51: Update Build Tools version to <API>.0.1. DO NOT MERGE. 
* commit '824490c66c387b4dd840463ac739ed67d5f64483':
 2014-10-26 00:51:29 +00:00
Trevor Johns
f3997da435 am 9e09cc99: am cc763b72: am 36274ac5: Add additional samples for L to sdk.atree 
* commit '9e09cc99292464a394f843c3b700098a4e81b92c':
 2014-10-26 00:51:28 +00:00
Trevor Johns
7dc09a8759 am 34dd1759: am de236d16: am 6876a9cf: Add browseable samples for L SDK release 
* commit '34dd175908ec75cc63c5b29b1932d3c0aff65b77':
 2014-10-26 00:51:28 +00:00
Trevor Johns
dbdbc00b33 am cfec1532: am e3e839e5: am 66b6f721: Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev 
* commit 'cfec1532dc354ddaa2409ec4aa8f25c7172dba57':
 2014-10-26 00:51:27 +00:00
Trevor Johns
87c7efeb06 am 6bf079a3: am 8176b906: am ca8bc22a: sdk.atree: Fix typo and remove legacy BluetoothChat sample 
* commit '6bf079a32f0ad93942ee90c0f67b7782e51bf54f':
 2014-10-26 00:51:26 +00:00
Trevor Johns
cf30383ad2 am 12c9391b: am 3beb9eae: am d991bed6: Resolved conflicts for merge of \'9875ec66\' into lmp-dev 
* commit '12c9391bc7db23cc00385ba797e02220555a1e89':
 2014-10-26 00:51:25 +00:00
Andrew Hsieh
6974f39ad4 am 220869bb: am d10b06eb: am 1305bed1: am c13cf09c: Merge "Add asm/a.out.h to arm64/mips/mips64" 
* commit '220869bbd6a3f9254dcda0b88ae85ed170158750':
 2014-10-26 00:51:24 +00:00
Andrew Hsieh
9e7c1ba2ad am 8d9384e2: am 10efbc14: am 0b4823b9: am 4e47988f: Merge "Remove macros putc*/getc* from API<21 stdio.h to use" 
* commit '8d9384e23e82f427defe72f5d5507860de01d264':
 2014-10-26 00:51:23 +00:00
Andrew Hsieh
50875b4e09 am 9fe3045f: am 2f5539a4: am 7a042ce4: am 9376f14e: Merge "Change sample native-codec\'s minSDK to android-21" 
* commit '9fe3045fe1e1611392cf7ab4a52d340bf35d9c90':
 2014-10-26 00:51:22 +00:00
Neil Fuller
75ec1f4727 am 09ac46ee: am 29329726: am 29923a44: am a6e8e0d8: Merge "Remove dependencies on FloatMath" 
* commit '09ac46eeed387ecb893f072e7630b8bc390f8343':
 2014-10-26 00:51:21 +00:00
Andrew Hsieh
49641f9dc7 am ad8bbae8: am d6bf7265: am e6a62f60: am dc942b9c: Merge "Make memory_order_acquire visible in global namespace" 
* commit 'ad8bbae857a5fc368b78badda0bc62fd273700ee':
 2014-10-26 00:51:20 +00:00
Andrew Hsieh
290414d49f am f5a01d4e: am 64724bcc: am 0d879513: am 106046ae: Merge "Rename android-L to android-21" 
* commit 'f5a01d4e74771a1e1d6d206ac46585d47b4f7f18':
 2014-10-26 00:51:19 +00:00
Andrew Hsieh
45b1fd4212 am 5e8eedd6: am 2a01c3f3: am 93dd2f8a: am b02b4bce: Merge "Add missing function prototypes in time.h" 
* commit '5e8eedd60eefbffe1015cf2a31acee4a466aac06':
 2014-10-26 00:51:18 +00:00
Trevor Johns
f95cb6b9ae am a9bf7946: am 85e87c55: am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev 
* commit 'a9bf79464cdde68bcd73023423743e9c935a31f4':
 2014-10-26 00:51:17 +00:00
Chenjie Luo
7a4a08480b am af09226b: am 950879ac: am 88fbf1fe: Update test runner for cts tests in testrunner/test_defs.xml 
* commit 'af09226b381e8d5abf1cda0223229f81029e85c9':
 2014-10-26 00:51:15 +00:00
Tor Norbye
154b4806d9 am e2b1e75f: am 3fa7b69d: am 3b2fe7eb: Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev 
* commit 'e2b1e75f19247376f48d77e06bbaef8bd4ea67a0':
 2014-10-26 00:51:14 +00:00
Deepanshu Gupta
60b1b2a82f am 512358bf: am e1a3f47e: am 2c34d62a: Update LayoutLib API level to 12. 
* commit '512358bf8636d90d0b2b3d74cc5640459c23e24c':
 2014-10-26 00:51:13 +00:00
Christopher Ferris
cb3211ed30 am 41560605: am de394866: am bb0d2060: Merge "Do not call art-on macro by default." into lmp-dev 
* commit '415606056c8a1c70e1817c15c0d4c71f395aeed6':
 2014-10-26 00:51:12 +00:00
Tor Norbye
05f968c447 am 2a279e62: am a22d6f70: am 0eac39db: 17782530: Annotations using retention policy source remain in .class 
* commit '2a279e626791cec6d0af518139dab8e29f1ca263':
 2014-10-26 00:51:11 +00:00
Xavier Ducrohet
03c26f8453 am 6f0ed4fc: am cb002a83: am 3c0cd8cf: Merge "Package libc++.so in the build-tools." into lmp-dev 
* commit '6f0ed4fc66a7c6a1a0491d00aaae5e0dc67f9e64':
 2014-10-26 00:51:10 +00:00
Ruben Brunk
3ac6fd9ad5 am a0f3d469: am f431341c: am e5aa0f3f: runtest: Remove unused CtsTestStubs dependency. 
* commit 'a0f3d4698656d69fe6261d08005edc3236e3ffcd':
 2014-10-26 00:51:09 +00:00
Yigit Boyar
d2a3891b59 am ef4e2cb0: am 5ea5cc3d: am 52af2550: Don\'t layout removed scrap views 
* commit 'ef4e2cb02ed3a0999af02b20ad6fd1c600d6530a':
 2014-10-26 00:51:08 +00:00
Stephen Hines
887b4a4aa4 am 2b36e292: am 513c112f: resolved conflicts for merge of 3f2caae2 to lmp-dev-plus-aosp 
* commit '2b36e2928ba7b7ba22e0e926b6f971b864c524a1':
 2014-10-26 00:51:07 +00:00
Andrew Hsieh
ebddf9d633 am 82835cc0: am 4981bc73: am 4217c22d: am bb148d92: Merge "Refresh android-L headers (WW40)" 
* commit '82835cc04ea8d0d4f21561c9c8744ad14ef9b33a':
 2014-10-26 00:51:06 +00:00
Dake Gu
8cb4a5a8d5 am 999496fe: am 671225a1: am 221b154a: SupportLeanbackDemo: Fix crash of launch Detail from Search 
* commit '999496fe3781b7afe5967fa649b995a62289814c':
 2014-10-26 00:51:05 +00:00
Andrew Hsieh
625d6a469b am dbfc578f: am 3dc64520: am 1978baa1: am ec2d5674: Merge "Bump up clang vesion accepting __builtin_isnan __attribute__((pcs("aapcs")))" 
* commit 'dbfc578f8a16cb486d60ef32ba22115e379c4ae3':
 2014-10-26 00:51:04 +00:00
Andrew Hsieh
f58d15ca23 am c543f0de: am a428c4d6: am f5ad59d4: am 154cb254: Merge "Add posix_memalign to libc.so for API 17,18,19" 
* commit 'c543f0def147732198ea619f8b89c8746ca52548':
 2014-10-26 00:51:03 +00:00
Andrew Hsieh
5cc7e2fd25 am d0e5f353: am 7d27bb77: am 132945b9: am c316a240: Merge "Added sys/ucontext.h and sys/user.h to all API levels." 
* commit 'd0e5f3539a900bfad34958f68c38d98b36c118af':
 2014-10-26 00:51:02 +00:00