Commit Graph

16814 Commits

Author SHA1 Message Date
Nagesh Susarla
51f0f6fc5d am db8549f5: am ba3ed08f: am 269c55d1: am b0136429: am ec2f91f5: am 109db5b4: Update browseable for MessagingService.
* commit 'db8549f5fe5188a43bdaacd65ae1a8942408c3f6':
2015-03-21 05:22:23 +00:00
Deepanshu Gupta
72d1917877 am aaa7b09b: am eb80f595: am 77073860: am 686b9b0f: am 13a2b70e: Merge "Update SDK Pkg Revision for API 21 to 2" into lmp-dev
* commit 'aaa7b09b7618666cb39331a839ec40ec31dce161':
2015-03-21 05:22:19 +00:00
Nagesh Susarla
9a7c7ec672 am ca2f22b8: am 3f0847fa: am ae3d36f2: am 55c9f03b: am 34b5d8e7: Update browseable for MediaBrowserService.
* commit 'ca2f22b8522941feaa1be5d778b22610f8d94a9f':
2015-03-21 05:22:14 +00:00
Renato Mangini
52ab5a300d am b5426dd2: am 72a6cea7: am 333e5d21: am 5777a7ff: am 0d0f4d63: Update browseable for MediaBrowserService sample.
* commit 'b5426dd2e266753a45a4823e62052ba7ade29c3f':
2015-03-21 05:22:09 +00:00
Dan Albert
b71386ed08 am f38993ca: am 409b471e: Merge "Explicitly use an older C++ standard."
* commit 'f38993ca440daeac1183269fa12d4773a2ae471b':
  Explicitly use an older C++ standard.
2015-03-21 05:22:07 +00:00
Ye Wen
3f09254e73 am 55e7d183: am 42ca4250: am 565cafe7: Merge "PduParser MSIM support (4/4)" into lmp-mr1-dev
* commit '55e7d1831c27a1c93c1c490d24fb0fdfd4436545':
2015-03-21 05:22:02 +00:00
Dake Gu
51b1ed70a5 am 57546d73: am 2b5d709a: am d51791b0: SupportLeanbackDemo: add test of delayed detail entrance transition
* commit '57546d733bf55ff876f47789b03d81744e118d16':
2015-03-21 05:21:56 +00:00
Craig Stout
1a116c5c4e am 15fe2252: am e8759461: am f92a171d: Merge "Use 2-param constructor for HeaderItem." into lmp-mr1-dev
* commit '15fe225286785425c83bf4af6b3a6cea910e6d23':
2015-03-21 05:21:51 +00:00
Craig Stout
93f37c00f5 am 4b8dd637: am b372b82d: am 4e79fdca: Fix NPE if user finishes activity quickly.
* commit '4b8dd637c8dc941ce83334149e713efd8f65e67d':
2015-03-21 05:21:47 +00:00
Renato Mangini
1ed5884842 am e4f6dd11: am ae743153: am c137e2f7: am aee1fdfd: am 6b016eb4: am 88079577: Merge "Update browseable for messagingservice." into lmp-docs
* commit 'e4f6dd1167e0e381c1a388f169b8da8da2995831':
2015-03-21 05:21:42 +00:00
Renato Mangini
0641708f12 am 7beff539: am 174f7e76: am ef8be5a7: am 2a7f9a5b: am f30a1f46: am bbbffffd: Fix copyright header
* commit '7beff53929e49e4c5a42a3f65212a5a939e11ad0':
2015-03-21 05:21:38 +00:00
Renato Mangini
ad88a96a29 am 26ec370e: am 20fbdda7: am 9ea10d65: am 445d4319: am 17590765: am d2ecef7d: Fix missing import statement on PackageValidator.
* commit '26ec370ee64895e764e970724812e21b47106149':
2015-03-21 05:21:33 +00:00
Lei Zhang
ed40988cc4 am 7dab1c0b: am a8f646a0: am 083b701b: am aa1b05f3: am b327085d: am a7090355: Verify calling package signature before returning browse root Uri.
* commit '7dab1c0b473959eb5678541d08f38b4d0774da5b':
2015-03-21 05:21:29 +00:00
Dan Albert
773bad28f6 am e5f323dc: am 9c93ba1d: Merge "Remove uses of stlport in testrunner."
* commit 'e5f323dcc0b0e07f7f77ff6133a8596473fcdc1a':
  Remove uses of stlport in testrunner.
2015-03-21 05:21:27 +00:00
Andrew Hsieh
e4238f408f am 15991270: am 3c864e04: Merge "Fix headers to be included alone"
* commit '15991270411435749299487582ffce012156cac2':
  Fix headers to be included alone
2015-03-21 05:21:25 +00:00
Andrew Hsieh
62a26918cd am 2520df14: am 397f2ea4: Merge "Change sysconf(3) to return long"
* commit '2520df14f7f17aec96d4b5d6d193ff688ec83e21':
  Change sysconf(3) to return long
2015-03-21 05:21:23 +00:00
Xavier Ducrohet
8bc4df1bb8 am 50768991: am 6970ca0c: am 55c46211: am fa26ce84: am a19e1e2c: Update build tools version to 21.1.2. DO NOT MERGE.
* commit '507689911637f3935d8a584f766d77312da0e40f':
2015-03-21 05:21:19 +00:00
Dake Gu
c47838feb5 am b1668409: am a6f3ac5f: am a238b22c: Merge "SupportLeanbackDemo: add test case of Browse/Details enter return transition" into lmp-mr1-dev
* commit 'b1668409ec84f9213f5afb1b452020762c546193':
2015-03-21 05:21:14 +00:00
Trevor Johns
24e4090156 am cb88d4af: am e40413a2: am e943e7d1: am dcaad78d: am 1a7636bd: am 7f169814: (-s ours) DO NOT MERGE: Sync prebuilts for lmp-docs
* commit 'cb88d4af9f572b7b41b3cc2f6f097bf309cd5fba':
2015-03-21 05:21:13 +00:00
Trevor Johns
fc3b4fec5a am 829a7554: am 990df13e: am 051ade8b: am 0254112f: am 64306935: am 1206ee41: (-s ours) DO NOT MERGE: Sync browseable samples for wear
* commit '829a75545395ed64947ab5acf8da5715018d63a8':
2015-03-21 05:21:09 +00:00
Trevor Johns
b684e8dae1 am e140f8dd: am c3c6324e: am f78c6348: am f83bd1f8: am 41478596: am c6b0eb1a: Merge "Revert "sdk.atree: Disable Wear samples for lmp branches"" into lmp-docs
* commit 'e140f8ddce04e4313e7d12d94ae781ab90e17947':
2015-03-21 05:21:04 +00:00
Trevor Johns
8cc908e91b am f19dcd1f: am 6efacc28: am 84bf28b2: am 27a5bbcb: am 5cdf8488: am 3081f16c: Sync browseable samples for lmp-docs
* commit 'f19dcd1fcd110370441afb90799c9694265fae99':
2015-03-21 05:20:59 +00:00
Xavier Ducrohet
b51ea38580 am 7ea372f8: am 8b743f99: am 35afa6de: am 2680677b: am 0c72bc36: Update support extra revision. DO NOT MERGE.
* commit '7ea372f84e86a44448a73ed60de70719e9b01c77':
2015-03-21 05:20:53 +00:00
Andrew Hsieh
9fbbe1a0b8 am 447ca094: am f72859a1: Merge "Add posix_memalign to API16\'s libc.so, and to stdlib.h for API 16, 17, 18, 19"
* commit '447ca09479765f892bc9341b682a93b4e85d3ffe':
  Add posix_memalign to API16's libc.so, and to stdlib.h for API 16, 17, 18, 19
2015-03-21 05:20:51 +00:00
Trevor Johns
fe8bf9b219 am da6cf75e: am f2ae7629: am 245f029a: am d009e0b3: am 0c094f0c: am d8c7b24e: Merge "Update browseable samples for lmp-docs" into lmp-docs
* commit 'da6cf75ea5f17c36609a55e57033f9f1281fc889':
2015-03-21 05:20:46 +00:00
Trevor Johns
99ad9124d1 am 400208ab: am 716f9ff5: am 0161ae54: am 705cf850: am 13ce376e: am dff4d5d4: Merge "Add two new samples." into lmp-docs
* commit '400208abf83476dd9530930136f3dd85bc08dd3c':
2015-03-21 05:20:40 +00:00
Trevor Johns
d4d32ad5cf am dfc8899c: am a25be96a: am 8488cdb6: am 5d84789a: am 062a2d1c: am fcd28181: sdk.atree: Disable Wear samples for lmp branches
* commit 'dfc8899c9e33056027b1999c2c4dc290c0290bcb':
2015-03-21 05:20:33 +00:00
Adam Lesinski
323969b7b0 am 5e44c883: am 94527b09: am ed6aaf3f: Merge "Add split-select tool to SDK build." into lmp-mr1-dev
* commit '5e44c8833f54026fca6a821577cebdef086ee356':
2015-03-21 05:20:28 +00:00
Deepanshu Gupta
171979553b am 3ecffe3b: am 8fbc5f53: am 058f1f0f: am 077d2052: am e3189c68: Update LayoutLib version for API 21 to 2.
* commit '3ecffe3b64b793696854509d28240caf41d9fd17':
2015-03-21 05:20:21 +00: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