Dmitriy Ivanov
|
699e02a100
|
am b4214eb5: am bb4c3d05: am fc3c8256: am 7d4c9612: Merge changes I0666e671,I90a1aed6
* commit 'b4214eb5b7b0e9fec32169431b2b4f0b30821113':
|
2015-03-23 22:35:53 +00:00 |
|
Baligh Uddin
|
621b1adfcc
|
am 52a9eff4: (-s ours) am 40653ae9: (-s ours) am f82c5022: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '52a9eff4781fee7b1c0d8ce339d18aeb24e9c3b4':
|
2015-03-23 22:35:50 +00:00 |
|
Baligh Uddin
|
02390dba45
|
am 2009e076: (-s ours) am 1dfe5210: (-s ours) am 1baffe78: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '2009e076d83476f0bb4ecf1eb786cbae7ad46988':
|
2015-03-23 22:35:48 +00:00 |
|
Tim Kilbourn
|
0d2c200a40
|
am 23c474b6: am bd76973c: am b029e4d4: am 2f6ded27: Add secondary text to cards.
* commit '23c474b6285a33f90a73da2c3483020cd90d2406':
|
2015-03-23 22:35:43 +00:00 |
|
Dake Gu
|
26e0b49b88
|
am 1a7936bf: am 57e93e8c: am 82435b27: am f66eadb5: SupportLeanbackDemo: Add test case for updating overview row
* commit '1a7936bf749d9907a0be3e110d783080d82b5f78':
|
2015-03-23 22:35:38 +00:00 |
|
Xavier Ducrohet
|
39c300e22f
|
am f823718e: am bf541eb5: am f75191cb: am 0d574614: am 25907e2a: am 8361bb0d: Update build-tools and support for multidex.
* commit 'f823718eb4eb4d764a9a02f18a7aecc2b434e5c7':
|
2015-03-23 22:35:34 +00:00 |
|
Xavier Ducrohet
|
38f9b60e94
|
am d483dabb: am a008a569: am 2c799e08: am e67c313e: am 9ccbed21: am 86d28ad8: Add jack/jill/multidex lib to build-tools.
* commit 'd483dabb61aed7fe5a8b44633adc7ed4a8c5b29b':
|
2015-03-23 22:35:29 +00:00 |
|
bohu
|
ad116729e4
|
am 3c1121cd: am 7122b3e9: am 8a29ecdd: am 5bedd192: am ccaaeb5f: am c01f2d39: Merge "Update system images to revision 3" into lmp-dev
* commit '3c1121cd5040bd5a9bc8c05ac68ca8492c26a6ea':
|
2015-03-23 22:35:23 +00:00 |
|
Xavier Ducrohet
|
552b27d088
|
am 62e326fc: (-s ours) am 501c9ac4: am 94f4c803: am 1770d4bd: am 17d47a10: am 5193f245: Merge "Update build tools version to 21.1.0. DO NOT MERGE." into lmp-dev
* commit '62e326fccecb2ea59814123227ed81efb34a7575':
|
2015-03-23 22:35:21 +00:00 |
|
Takeshi Hagikura
|
23bd4d3d53
|
am de846ed4: am 90f430c9: am 0ebad463: am e38db4c5: am 5350100b: am f6855153: Merge "resolved conflicts for merge of 3bb3da96 to lmp-dev" into lmp-dev
* commit 'de846ed4ef732cbefcbe7be16664d906dd4ac9a6':
|
2015-03-23 22:35:16 +00:00 |
|
Andrew Hsieh
|
032c848593
|
am cf42d2eb: am 86437bbb: am fbee7f97: am f8d4dfbf: Merge "Cherry-pick: Only use <atomic> for C++11 and newer"
* commit 'cf42d2eb47945f73145e2fddcdd1d2ecbc32b976':
|
2015-03-23 22:35:14 +00:00 |
|
Dake Gu
|
14b82c1075
|
am 2d2d4106: am dc5cecd8: am 99cf1af3: am 455a4c3f: Merge "SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace()" into lmp-mr1-dev
* commit '2d2d4106faaa0631f4f4777c8973f47ed122735d':
|
2015-03-23 22:35:09 +00:00 |
|
Adam Lesinski
|
72596b7ba9
|
am 97937e8f: am 291e86fb: am 23dfdd09: am 56fd4241: Merge "Enable building gtest for Windows" into lmp-mr1-dev
* commit '97937e8fd73c43238300151c9b33add5e965d760':
|
2015-03-23 22:35:05 +00:00 |
|
Dake Gu
|
ad342bb13f
|
am bcc50527: am 1554fa43: am 1eaf20c6: am d18c4a82: Merge "SupportLeanbackDemo: show case of different image scale type" into lmp-mr1-dev
* commit 'bcc5052717efb9d691a5538d5bd5a9208cfa4ba8':
|
2015-03-23 22:34:59 +00:00 |
|
Chenjie Luo
|
5c909b9442
|
am 1eb126fe: am 9d91239a: am b793668b: am 3b0ab876: Merge "Modify testrunner/test_defs.xml to delete obsolete cts tests" into lmp-dev
* commit '1eb126fe081d4434d9480f0997aef23989b5b17f':
|
2015-03-23 22:34:55 +00:00 |
|
Baligh Uddin
|
90dde447a6
|
am bef9a24f: (-s ours) am b026fa1f: (-s ours) am 3bef59ab: (-s ours) am 3a39d4e2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'bef9a24f5e6f88425e3ea8cbd53cf75b57e0d16b':
|
2015-03-23 22:34:52 +00:00 |
|
Baligh Uddin
|
288913733d
|
am a9df185c: (-s ours) am fd23c3f1: (-s ours) am d5c6c1cd: (-s ours) am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE
* commit 'a9df185cfdfd57c7c2348bd0c5280f630a291445':
|
2015-03-23 22:34:50 +00:00 |
|
Xavier Ducrohet
|
35c778ce57
|
am b43f9620: (-s ours) am 824490c6: am f2dcbd2e: (-s ours) am 946bfb51: Update Build Tools version to <API>.0.1. DO NOT MERGE.
* commit 'b43f96207b5924ecafb9ab929830f32733baf5d8':
|
2015-03-23 22:34:48 +00:00 |
|
Trevor Johns
|
6b771ef5a5
|
am 6c32365b: am 9e09cc99: am cc763b72: am 36274ac5: Add additional samples for L to sdk.atree
* commit '6c32365b73e54c9666747730d21eb0d0c1a93961':
|
2015-03-23 22:34:46 +00:00 |
|
Trevor Johns
|
7f212bab88
|
am 9fa93f50: am 34dd1759: am de236d16: am 6876a9cf: Add browseable samples for L SDK release
* commit '9fa93f50af447f24ef3f34d9bd2b99cf364103bf':
|
2015-03-23 22:34:44 +00:00 |
|
Trevor Johns
|
5ca158a233
|
am 947c0ba8: am cfec1532: am e3e839e5: am 66b6f721: Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev
* commit '947c0ba8587afbe5ab28dcaf8e839aeff6a09626':
|
2015-03-23 22:34:42 +00:00 |
|
Trevor Johns
|
a84cbbf21b
|
am 4ca81999: am 6bf079a3: am 8176b906: am ca8bc22a: sdk.atree: Fix typo and remove legacy BluetoothChat sample
* commit '4ca81999c6d42f4bb56b2bfe0fe0d3a39c380cff':
|
2015-03-23 22:34:40 +00:00 |
|
Trevor Johns
|
ed50890129
|
am aa786c66: am 12c9391b: am 3beb9eae: am d991bed6: Resolved conflicts for merge of \'9875ec66\' into lmp-dev
* commit 'aa786c66fee531a37dfd2b28112215e378d21327':
|
2015-03-23 22:34:37 +00:00 |
|
Andrew Hsieh
|
65f5dfe8ad
|
am 285bea26: am 220869bb: am d10b06eb: am 1305bed1: am c13cf09c: Merge "Add asm/a.out.h to arm64/mips/mips64"
* commit '285bea26d9c36d67babafa1f771894b9ac69b3da':
|
2015-03-23 22:34:35 +00:00 |
|
Andrew Hsieh
|
9d81dc59bb
|
am dcdaec62: am 8d9384e2: am 10efbc14: am 0b4823b9: am 4e47988f: Merge "Remove macros putc*/getc* from API<21 stdio.h to use"
* commit 'dcdaec62356734c0ae9d370008c7fa8f9b787775':
|
2015-03-23 22:34:33 +00:00 |
|
Andrew Hsieh
|
dd2fff275d
|
am a59f8c38: am 9fe3045f: am 2f5539a4: am 7a042ce4: am 9376f14e: Merge "Change sample native-codec\'s minSDK to android-21"
* commit 'a59f8c3858398efa7b4da7369fcda760de284c7e':
|
2015-03-23 22:34:31 +00:00 |
|
Neil Fuller
|
d551c112db
|
am 94124c3a: am 09ac46ee: am 29329726: am 29923a44: am a6e8e0d8: Merge "Remove dependencies on FloatMath"
* commit '94124c3a95f546ce918c073f38f5d93ff5b140af':
|
2015-03-23 22:34:29 +00:00 |
|
Andrew Hsieh
|
d5029c4ceb
|
am bb155e97: am ad8bbae8: am d6bf7265: am e6a62f60: am dc942b9c: Merge "Make memory_order_acquire visible in global namespace"
* commit 'bb155e9792295e7871513f0fa9b7387e88228510':
|
2015-03-23 22:34:27 +00:00 |
|
Andrew Hsieh
|
c92e428e7b
|
am 24d5b893: am f5a01d4e: am 64724bcc: am 0d879513: am 106046ae: Merge "Rename android-L to android-21"
* commit '24d5b893c4cab5ba4c1ca926716ff7c474dc276d':
|
2015-03-23 22:34:25 +00:00 |
|
Andrew Hsieh
|
8f142f0f7b
|
am f7b6d695: am 5e8eedd6: am 2a01c3f3: am 93dd2f8a: am b02b4bce: Merge "Add missing function prototypes in time.h"
* commit 'f7b6d6952554da43f383f2d0e582df31f6156390':
|
2015-03-23 22:34:21 +00:00 |
|
Trevor Johns
|
5dc880ba16
|
am 9236abd4: am a9bf7946: am 85e87c55: am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev
* commit '9236abd430fda40d5666279d63d3c927f9ae715a':
|
2015-03-23 22:34:19 +00:00 |
|
Chenjie Luo
|
17176ee8d2
|
am 4f5f19e3: am af09226b: am 950879ac: am 88fbf1fe: Update test runner for cts tests in testrunner/test_defs.xml
* commit '4f5f19e32d649fc2674bb41d6696af2cb2ff87f1':
|
2015-03-23 22:34:15 +00:00 |
|
Tor Norbye
|
9171f44820
|
am 4351ec4c: am e2b1e75f: am 3fa7b69d: am 3b2fe7eb: Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev
* commit '4351ec4c6b1a12739bab3203dbfb6ebfee18cf7e':
|
2015-03-23 22:34:11 +00:00 |
|
Deepanshu Gupta
|
d776c9580b
|
am 699e02ec: am 512358bf: am e1a3f47e: am 2c34d62a: Update LayoutLib API level to 12.
* commit '699e02ecf6358b4284ad56ae0173a5f82f8cac79':
|
2015-03-23 22:34:07 +00:00 |
|
Christopher Ferris
|
16fc8ee242
|
am 79e8c927: am 41560605: am de394866: am bb0d2060: Merge "Do not call art-on macro by default." into lmp-dev
* commit '79e8c9278029a9b4bd2fcf18099535494e110215':
|
2015-03-23 22:34:03 +00:00 |
|
Tor Norbye
|
4643d98a89
|
am 1d3a49eb: am 2a279e62: am a22d6f70: am 0eac39db: 17782530: Annotations using retention policy source remain in .class
* commit '1d3a49eb0b7a3547e449f5da185512de09c6c1b0':
|
2015-03-23 22:33:59 +00:00 |
|
Xavier Ducrohet
|
bea5a34328
|
am 1b7a670c: am 6f0ed4fc: am cb002a83: am 3c0cd8cf: Merge "Package libc++.so in the build-tools." into lmp-dev
* commit '1b7a670c314436810b1998d9463e67da83bec0f4':
|
2015-03-23 22:33:57 +00:00 |
|
Ruben Brunk
|
91d86bbffd
|
am 9dc60411: am a0f3d469: am f431341c: am e5aa0f3f: runtest: Remove unused CtsTestStubs dependency.
* commit '9dc60411a276dcdaed7494c758e9cc661dea90bb':
|
2015-03-23 22:33:55 +00:00 |
|
Yigit Boyar
|
f48c96cfed
|
am 27981903: am ef4e2cb0: am 5ea5cc3d: am 52af2550: Don\'t layout removed scrap views
* commit '279819035dcca6a9680a7720bfee5077509e67ee':
|
2015-03-23 22:33:53 +00:00 |
|
Stephen Hines
|
f42aeb8e2b
|
am 6ad70fb2: am 2b36e292: am 513c112f: resolved conflicts for merge of 3f2caae2 to lmp-dev-plus-aosp
* commit '6ad70fb28c22f39ad5ce212fc74133487c41182d':
|
2015-03-23 22:33:49 +00:00 |
|
Andrew Hsieh
|
14bfe01ece
|
am b83c6c58: am 82835cc0: am 4981bc73: am 4217c22d: am bb148d92: Merge "Refresh android-L headers (WW40)"
* commit 'b83c6c58438070223ff67c9e62cb6695129fde1c':
|
2015-03-23 22:33:45 +00:00 |
|
Dake Gu
|
1708933662
|
am 1240ac4f: am 999496fe: am 671225a1: am 221b154a: SupportLeanbackDemo: Fix crash of launch Detail from Search
* commit '1240ac4fdfe922a8b00d48f1b8b7e7c2a44c43c7':
|
2015-03-23 22:33:41 +00:00 |
|
Andrew Hsieh
|
2f9a849925
|
am ce31f426: am dbfc578f: am 3dc64520: am 1978baa1: am ec2d5674: Merge "Bump up clang vesion accepting __builtin_isnan __attribute__((pcs("aapcs")))"
* commit 'ce31f426a0fb30ae5cdad9261edbe51b5d4138d4':
|
2015-03-23 22:33:37 +00:00 |
|
Andrew Hsieh
|
10482cd8e5
|
am c8041e9f: am c543f0de: am a428c4d6: am f5ad59d4: am 154cb254: Merge "Add posix_memalign to libc.so for API 17,18,19"
* commit 'c8041e9fbc5379deec77f62fd7de4eb453426007':
|
2015-03-23 22:33:33 +00:00 |
|
Andrew Hsieh
|
984b2a9225
|
am 13b3ffe0: am d0e5f353: am 7d27bb77: am 132945b9: am c316a240: Merge "Added sys/ucontext.h and sys/user.h to all API levels."
* commit '13b3ffe0b6dc80a904975b25b869b7813ef3980a':
|
2015-03-23 22:33:28 +00:00 |
|
Dan Albert
|
685cf9f137
|
am c2738b28: am 58b157f4: am 48a1ff86: am 9bc92deb: am 20d16a75: Merge "Silence lcov existence test output."
* commit 'c2738b28ca23e13cb0fc5a706646c67ba9c7c6bb':
|
2015-03-23 22:33:24 +00:00 |
|
Xavier Ducrohet
|
ac38e96d40
|
am 5ec1247b: am c4f43d23: am 8439bda6: am 91909fae: Prepare the SDK component version numbers.
* commit '5ec1247bcbf5341042ad6e99d93b3e5eeb412297':
|
2015-03-23 22:33:20 +00:00 |
|
Dan Albert
|
fea11cfec0
|
am 2ec0acda: am 4876083d: am f9026b36: am cbe2394e: am 217d230a: Merge "Add acov for coverage gathering/reporting."
* commit '2ec0acda65210c651ac25e84f6d7634c47e1af72':
|
2015-03-23 22:33:16 +00:00 |
|
Andrew Hsieh
|
7e167b910e
|
am 151ad0ec: am cf8c5939: am 7ab39b2a: am 04df6b31: am eef4aba8: Merge "Add missing posix_memalign function in x86 libc.so.functions.txt. (See b.android.com/28834)"
* commit '151ad0ecd836db03ed48299aa84e896db5bcbfa9':
|
2015-03-23 22:33:14 +00:00 |
|
Dake Gu
|
6076b2e3fb
|
am cfe55935: am 2d0be53e: am 0b5fedbd: am 7c4d38c4: SupportLeanbackDemo: dont override fragment\'s object from activity
* commit 'cfe5593564ad8b776ae5517b01a77f066355730f':
|
2015-03-23 22:33:11 +00:00 |
|