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 |
|
Elliott Hughes
|
198dff7e80
|
am 6274085c: am 27db85ff: Merge "Made development/scripts/stack work on Mac."
* commit '6274085c47dd50541d232c674fb958ce4c5be149':
Made development/scripts/stack work on Mac.
|
2015-03-21 05:20:17 +00:00 |
|
Jim Miller
|
49f2854088
|
am b7651e12: am 1064b49c: am eb7edd58: Merge "Update TrustAgentService API after review" into lmp-mr1-dev
* commit 'b7651e12c444fbfd2b3a19c9e5181306c11b5852':
|
2015-03-21 05:20:10 +00:00 |
|
Dmitry Shmidt
|
9992856cc0
|
am 850fe6a3: am 5cc7f9ba: am d00a0a73: Development: Connectivity: Fix receiver leakage
* commit '850fe6a3aff202a1e6f7a4328ac6dcf2e6b7f55b':
|
2015-03-21 05:20:04 +00:00 |
|
Xavier Ducrohet
|
7e09b18d18
|
am b00c3598: am f8a6d8f1: am 66b2f251: am 883b17b3: am 5b7f5d2b: Update build-tools revision. DO NOT MERGE.
* commit 'b00c35989395f0b9be0b388363ff624cf8eacadf':
|
2015-03-21 05:20:00 +00:00 |
|
Xavier Ducrohet
|
e63773441c
|
am 2dcf8072: am d150e285: am 4aceb725: am 754cfeb6: am 8641d4da: Move mulit-dex files around.
* commit '2dcf807247243e0fd0c0e14f943924db138c86b4':
|
2015-03-21 05:19:54 +00:00 |
|
Dmitriy Ivanov
|
b4214eb5b7
|
am bb4c3d05: am fc3c8256: am 7d4c9612: Merge changes I0666e671,I90a1aed6
* commit 'bb4c3d05f3daa7eb922d6941fa2e2776ab3856f3':
Do not call art-on macro by default.
Add support for debugging ART to the dalvik.gdb script.
|
2015-03-21 05:19:53 +00:00 |
|
Baligh Uddin
|
52a9eff478
|
am 40653ae9: (-s ours) am f82c5022: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '40653ae9bb9e3e5bd647ce8da9ab0b095bde6849':
Import translations. DO NOT MERGE
|
2015-03-21 05:19:51 +00:00 |
|
Baligh Uddin
|
2009e076d8
|
am 1dfe5210: (-s ours) am 1baffe78: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '1dfe52103f04675e0d7ee6b5e2a515cb6732403d':
Import translations. DO NOT MERGE
|
2015-03-21 05:19:49 +00:00 |
|
Tim Kilbourn
|
23c474b628
|
am bd76973c: am b029e4d4: am 2f6ded27: Add secondary text to cards.
* commit 'bd76973c0cf0ccec9b02ce2f77cd8a988fdd375c':
|
2015-03-21 05:19:44 +00:00 |
|
Dake Gu
|
1a7936bf74
|
am 57e93e8c: am 82435b27: am f66eadb5: SupportLeanbackDemo: Add test case for updating overview row
* commit '57e93e8c1b690eecb87644876bf8f9df1d4c3dfc':
|
2015-03-21 05:19:40 +00:00 |
|
Xavier Ducrohet
|
f823718eb4
|
am bf541eb5: am f75191cb: am 0d574614: am 25907e2a: am 8361bb0d: Update build-tools and support for multidex.
* commit 'bf541eb5107f246782a9ce88f5a460ecb927b851':
|
2015-03-21 05:19:35 +00:00 |
|
Xavier Ducrohet
|
d483dabb61
|
am a008a569: am 2c799e08: am e67c313e: am 9ccbed21: am 86d28ad8: Add jack/jill/multidex lib to build-tools.
* commit 'a008a5698a44191f0e5ed4693b9bc06012441727':
|
2015-03-21 05:19:29 +00:00 |
|
bohu
|
3c1121cd50
|
am 7122b3e9: am 8a29ecdd: am 5bedd192: am ccaaeb5f: am c01f2d39: Merge "Update system images to revision 3" into lmp-dev
* commit '7122b3e99f35ab4e1a69b17027dfb2b1161900ac':
|
2015-03-21 05:19:23 +00:00 |
|
Xavier Ducrohet
|
62e326fcce
|
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 '501c9ac4af1d040d43e231520b4a3d82f3ac3eb3':
|
2015-03-21 05:19:18 +00:00 |
|
Takeshi Hagikura
|
de846ed4ef
|
am 90f430c9: am 0ebad463: am e38db4c5: am 5350100b: am f6855153: Merge "resolved conflicts for merge of 3bb3da96 to lmp-dev" into lmp-dev
* commit '90f430c9524755f50f124ea741fa29e93dcb9fc0':
|
2015-03-21 05:19:13 +00:00 |
|
Andrew Hsieh
|
cf42d2eb47
|
am 86437bbb: am fbee7f97: am f8d4dfbf: Merge "Cherry-pick: Only use <atomic> for C++11 and newer"
* commit '86437bbb6569b6018bf386c7bdeaa70e1c0d81f5':
Cherry-pick: Only use <atomic> for C++11 and newer
|
2015-03-21 05:19:11 +00:00 |
|
Dake Gu
|
2d2d4106fa
|
am dc5cecd8: am 99cf1af3: am 455a4c3f: Merge "SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace()" into lmp-mr1-dev
* commit 'dc5cecd8522aa8dfc2b304e67524a11b54ed79c2':
|
2015-03-21 05:19:06 +00:00 |
|
Adam Lesinski
|
97937e8fd7
|
am 291e86fb: am 23dfdd09: am 56fd4241: Merge "Enable building gtest for Windows" into lmp-mr1-dev
* commit '291e86fb92fd53fb3e2d15fd553280435b5a8242':
|
2015-03-21 05:19:01 +00:00 |
|
Dake Gu
|
bcc5052717
|
am 1554fa43: am 1eaf20c6: am d18c4a82: Merge "SupportLeanbackDemo: show case of different image scale type" into lmp-mr1-dev
* commit '1554fa43394d1effd2abd13183b57808ec8b3bbc':
|
2015-03-21 05:18:57 +00:00 |
|
Chenjie Luo
|
1eb126fe08
|
am 9d91239a: am b793668b: am 3b0ab876: Merge "Modify testrunner/test_defs.xml to delete obsolete cts tests" into lmp-dev
* commit '9d91239a4da7dabeed034043d67c1eee6e9d3598':
|
2015-03-21 05:18:55 +00:00 |
|
Baligh Uddin
|
bef9a24f5e
|
am b026fa1f: (-s ours) am 3bef59ab: (-s ours) am 3a39d4e2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'b026fa1ffcbcc97ecc609213a3e7b729591fb67d':
|
2015-03-21 05:18:52 +00:00 |
|
Baligh Uddin
|
a9df185cfd
|
am fd23c3f1: (-s ours) am d5c6c1cd: (-s ours) am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE
* commit 'fd23c3f1a2e33bde9f1e0312a37f20aafd291d9c':
|
2015-03-21 05:18:50 +00:00 |
|
Xavier Ducrohet
|
b43f96207b
|
am 824490c6: am f2dcbd2e: (-s ours) am 946bfb51: Update Build Tools version to <API>.0.1. DO NOT MERGE.
* commit '824490c66c387b4dd840463ac739ed67d5f64483':
|
2015-03-21 05:18:48 +00:00 |
|
Trevor Johns
|
6c32365b73
|
am 9e09cc99: am cc763b72: am 36274ac5: Add additional samples for L to sdk.atree
* commit '9e09cc99292464a394f843c3b700098a4e81b92c':
|
2015-03-21 05:18:46 +00:00 |
|
Trevor Johns
|
9fa93f50af
|
am 34dd1759: am de236d16: am 6876a9cf: Add browseable samples for L SDK release
* commit '34dd175908ec75cc63c5b29b1932d3c0aff65b77':
|
2015-03-21 05:18:44 +00:00 |
|
Trevor Johns
|
947c0ba858
|
am cfec1532: am e3e839e5: am 66b6f721: Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev
* commit 'cfec1532dc354ddaa2409ec4aa8f25c7172dba57':
|
2015-03-21 05:18:43 +00:00 |
|
Trevor Johns
|
4ca81999c6
|
am 6bf079a3: am 8176b906: am ca8bc22a: sdk.atree: Fix typo and remove legacy BluetoothChat sample
* commit '6bf079a32f0ad93942ee90c0f67b7782e51bf54f':
|
2015-03-21 05:18:41 +00:00 |
|
Trevor Johns
|
aa786c66fe
|
am 12c9391b: am 3beb9eae: am d991bed6: Resolved conflicts for merge of \'9875ec66\' into lmp-dev
* commit '12c9391bc7db23cc00385ba797e02220555a1e89':
|
2015-03-21 05:18:40 +00:00 |
|
Andrew Hsieh
|
285bea26d9
|
am 220869bb: am d10b06eb: am 1305bed1: am c13cf09c: Merge "Add asm/a.out.h to arm64/mips/mips64"
* commit '220869bbd6a3f9254dcda0b88ae85ed170158750':
|
2015-03-21 05:18:38 +00:00 |
|
Andrew Hsieh
|
dcdaec6235
|
am 8d9384e2: am 10efbc14: am 0b4823b9: am 4e47988f: Merge "Remove macros putc*/getc* from API<21 stdio.h to use"
* commit '8d9384e23e82f427defe72f5d5507860de01d264':
|
2015-03-21 05:18:36 +00:00 |
|
Andrew Hsieh
|
a59f8c3858
|
am 9fe3045f: am 2f5539a4: am 7a042ce4: am 9376f14e: Merge "Change sample native-codec\'s minSDK to android-21"
* commit '9fe3045fe1e1611392cf7ab4a52d340bf35d9c90':
|
2015-03-21 05:18:33 +00:00 |
|
Neil Fuller
|
94124c3a95
|
am 09ac46ee: am 29329726: am 29923a44: am a6e8e0d8: Merge "Remove dependencies on FloatMath"
* commit '09ac46eeed387ecb893f072e7630b8bc390f8343':
|
2015-03-21 05:18:31 +00:00 |
|
Andrew Hsieh
|
bb155e9792
|
am ad8bbae8: am d6bf7265: am e6a62f60: am dc942b9c: Merge "Make memory_order_acquire visible in global namespace"
* commit 'ad8bbae857a5fc368b78badda0bc62fd273700ee':
|
2015-03-21 05:18:30 +00:00 |
|
Andrew Hsieh
|
24d5b893c4
|
am f5a01d4e: am 64724bcc: am 0d879513: am 106046ae: Merge "Rename android-L to android-21"
* commit 'f5a01d4e74771a1e1d6d206ac46585d47b4f7f18':
|
2015-03-21 05:18:28 +00:00 |
|
Andrew Hsieh
|
f7b6d69525
|
am 5e8eedd6: am 2a01c3f3: am 93dd2f8a: am b02b4bce: Merge "Add missing function prototypes in time.h"
* commit '5e8eedd60eefbffe1015cf2a31acee4a466aac06':
|
2015-03-21 05:18:26 +00:00 |
|
Trevor Johns
|
9236abd430
|
am a9bf7946: am 85e87c55: am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev
* commit 'a9bf79464cdde68bcd73023423743e9c935a31f4':
|
2015-03-21 05:18:24 +00:00 |
|
Chenjie Luo
|
4f5f19e32d
|
am af09226b: am 950879ac: am 88fbf1fe: Update test runner for cts tests in testrunner/test_defs.xml
* commit 'af09226b381e8d5abf1cda0223229f81029e85c9':
|
2015-03-21 05:18:22 +00:00 |
|
Tor Norbye
|
4351ec4c6b
|
am e2b1e75f: am 3fa7b69d: am 3b2fe7eb: Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev
* commit 'e2b1e75f19247376f48d77e06bbaef8bd4ea67a0':
|
2015-03-21 05:18:20 +00:00 |
|
Deepanshu Gupta
|
699e02ecf6
|
am 512358bf: am e1a3f47e: am 2c34d62a: Update LayoutLib API level to 12.
* commit '512358bf8636d90d0b2b3d74cc5640459c23e24c':
|
2015-03-21 05:18:16 +00:00 |
|
Christopher Ferris
|
79e8c92780
|
am 41560605: am de394866: am bb0d2060: Merge "Do not call art-on macro by default." into lmp-dev
* commit '415606056c8a1c70e1817c15c0d4c71f395aeed6':
|
2015-03-21 05:18:14 +00:00 |
|
Tor Norbye
|
1d3a49eb0b
|
am 2a279e62: am a22d6f70: am 0eac39db: 17782530: Annotations using retention policy source remain in .class
* commit '2a279e626791cec6d0af518139dab8e29f1ca263':
|
2015-03-21 05:18:12 +00:00 |
|
Xavier Ducrohet
|
1b7a670c31
|
am 6f0ed4fc: am cb002a83: am 3c0cd8cf: Merge "Package libc++.so in the build-tools." into lmp-dev
* commit '6f0ed4fc66a7c6a1a0491d00aaae5e0dc67f9e64':
|
2015-03-21 05:18:10 +00:00 |
|
Ruben Brunk
|
9dc60411a2
|
am a0f3d469: am f431341c: am e5aa0f3f: runtest: Remove unused CtsTestStubs dependency.
* commit 'a0f3d4698656d69fe6261d08005edc3236e3ffcd':
|
2015-03-21 05:18:08 +00:00 |
|
Yigit Boyar
|
279819035d
|
am ef4e2cb0: am 5ea5cc3d: am 52af2550: Don\'t layout removed scrap views
* commit 'ef4e2cb02ed3a0999af02b20ad6fd1c600d6530a':
|
2015-03-21 05:18:05 +00:00 |
|
Stephen Hines
|
6ad70fb28c
|
am 2b36e292: am 513c112f: resolved conflicts for merge of 3f2caae2 to lmp-dev-plus-aosp
* commit '2b36e2928ba7b7ba22e0e926b6f971b864c524a1':
|
2015-03-21 05:18:03 +00:00 |
|
Andrew Hsieh
|
b83c6c5843
|
am 82835cc0: am 4981bc73: am 4217c22d: am bb148d92: Merge "Refresh android-L headers (WW40)"
* commit '82835cc04ea8d0d4f21561c9c8744ad14ef9b33a':
|
2015-03-21 05:18:01 +00:00 |
|