Commit Graph

14239 Commits

Author SHA1 Message Date
Andrew Hsieh
2d88e724cc am 82b5daf2: am 6bb8a8a5: am 75764b4c: am 97af2619: am 377e5e9b: Merge "Update 64-bit headers/libs"
* commit '82b5daf2cd0075f0bcfef106fcd9e1b1141b098a':
2014-05-13 15:20:09 +00:00
Alexander Lucas
4cd6a9af91 am 95b8d33d: am f0052e3b: am e5d22f68: am e6dcd2f5: am 4bf9ebc7: am fb5e574e: Updated browseable samples for april push
* commit '95b8d33dd233dfbc5fb5dc6acd9a33caf813db84':
2014-05-13 15:20:08 +00:00
Andrew Hsieh
7c75e719c6 am a1ae498e: am ea45910c: am 3fc69fb1: am 21de3013: am f90d4304: Merge "Remove accidentally committed in Makefile."
* commit 'a1ae498e92026308c14c1a2efa2586645bbe19b4':
2014-05-13 15:20:07 +00:00
Xavier Ducrohet
42a9514fc4 am da4f3729: (-s ours) am f3ee0f86: am c514a33d: (-s ours) am 4c3d9d23: am 26b61880: Move support lib to 19.2.0. Do not merge.
* commit 'da4f37290be08ea1690b0d0361b7f4570f03fc58':
2014-05-13 15:20:06 +00:00
Andrew Hsieh
7f95fb4ad0 am 27d5cdaa: am c88b9497: am f3109db8: am 37f3302d: am 6db591b9: Merge "Directories/symlinks changes for x86_64 support"
* commit '27d5cdaa943d805819013110d2bbc6ae7c566967':
2014-05-13 15:20:04 +00:00
Brian Attwell
55ac0a4104 am 4ec8b6af: am 27305158: Remove stream activities from sample sync adapter
* commit '4ec8b6af9a8df8e86aa423fc54d5ee35fd17cb4f':
2014-05-13 15:20:03 +00:00
Andrew Hsieh
06dbc5fe04 am 34a88af2: am 62bfb470: am 0c3ed0f3: am 11cd67cc: am 2d2e407f: Merge "Implement libportable for unknown arch 64bit."
* commit '34a88af2bb81462fa13d90ee64a64c2f60a4ef17':
2014-05-13 15:20:02 +00:00
Tim Kilbourn
e41be06133 am adbc69e7: am 931d5741: am 55458e67: am e0cd23d9: Use ImageCardview in leanback samples.
* commit 'adbc69e7fac91c20b155470ddafceb21ef8f702e':
2014-05-13 15:20:01 +00:00
Alan Viverette
6d31940b9f am 3ccf4b43: am 676bf550: Merge "Update ApiDemos to use API 20, default theme"
* commit '3ccf4b430d9c7339038d07c11889d221992e1121':
2014-05-13 15:20:00 +00:00
Craig Stout
21a0338031 am fbf3f914: am 269cc366: am f6da1180: am 3d2e6fb9: Add VerticalGridActivity to the leanback demo.
* commit 'fbf3f914b3aba80f1ab700fc4f3a042d487d5933':
2014-05-13 15:19:59 +00:00
Alan Viverette
4d4f8e80ce am 80ab488d: am f8f90106: Merge "Fix numbering in API Demos"
* commit '80ab488de37860d50ad4d4100db20aa591666ca3':
2014-05-13 15:19:57 +00:00
Steve Moyer
c3ca48803e am 2cdb05af: (-s ours) am e4e5195e: am f457a863: (-s ours) am 1601b1c9: (-s ours) am 6c56e9e1: (-s ours) Merge "DO NOT MERGE: fix package for AndroidJUnitRunner"
* commit '2cdb05af479674e9085465365b5b04159d9add7b':
2014-05-13 15:19:56 +00:00
George Mount
af5cfacc74 am f52d012c: am b3059f87: Use framework Transition MoveImage and Slide
* commit 'f52d012cf2a7c3a188d8c08998a89fc6d058f366':
2014-05-13 15:19:55 +00:00
Tim Kilbourn
af4f46f36c am b015b147: am 2afda8f4: am e88b659c: am 29830054: Add callbacks for actions in details.
* commit 'b015b1472adfda8116a509b4973c27a9f4843146':
2014-05-13 15:19:54 +00:00
Tim Kilbourn
aa5086edcf am 56768e0e: am 77815190: am 62ff9646: am 7f94b8d6: Add a details fragment to leanback samples.
* commit '56768e0e9f24acde6b87abb6def366918758315c':
2014-05-13 15:19:53 +00:00
Xavier Ducrohet
54184d1a63 am 25b9385c: (-s ours) am bff5b88a: am 14c79bb8: (-s ours) am f3ff0296: Move ZipAlign to build-tools. DO NOT MERGE.
* commit '25b9385c590e18f3e9b4949286f6d44a901a673f':
2014-05-13 15:19:52 +00:00
Steve Moyer
1a056474c4 am 0478f3fe: (-s ours) am eea325e5: am 510fca8b: (-s ours) am 20c4a334: (-s ours) am 0b1a1f7b: (-s ours) Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests"
* commit '0478f3fe656e44eb05863eee73ed5d6c4075c492':
2014-05-13 15:19:51 +00:00
Xavier Ducrohet
8ee14df198 am e2228683: am 8821b239: am d6ccbcd2: am 47eadf1e: Merge "Move ZipAlign to build-tools."
* commit 'e22286831fee7684e9f826360c45bb19ce8b2cac':
2014-05-13 15:19:50 +00:00
Andrew Hsieh
a494690fdc am 5cc87a39: am 1da473b4: am c415108e: am 497b94df: Merge "Headers update from bionic for x86_64 support"
* commit '5cc87a392ed9f416bdbd07362b290ea7b959d864':
2014-05-13 15:19:46 +00:00
Michael Wright
98b8a9b5b9 am 27854d34: am 26b91ca8: Add logging for failed injections to Monkey.
* commit '27854d34a5e464c2b41db34d602423e894149869':
2014-05-13 15:19:45 +00:00
Andrew Hsieh
789b451081 am ac7d1f9f: am 4e2c5f8a: am 2a87ef1a: am 0123d349: Merge "Move _types.h to 32-bit arch dirs to avoid impact on 64-bits"
* commit 'ac7d1f9f952909ff1aabc6a7c222784ec1679c72':
2014-05-13 15:19:39 +00:00
Andrew Hsieh
a90f611c53 am ec58d454: am 00f82e18: am 930e9fee: am ac982541: Merge "Refresh locale.h from bionic"
* commit 'ec58d454f276ac87524c78ea18577eed68d99fdf':
2014-05-13 15:19:38 +00:00
Andrew Hsieh
b6e589a776 am 6dd1de82: am 161289c3: am d64062a0: am 1782523e: Merge "Add 64-bit libc.so/libm.so/libdl.so"
* commit '6dd1de82c10939d4d5e1c32b4f907c30b5f99af5':
2014-05-13 15:19:37 +00:00
Yigit Boyar
5b78f1898f am c1ae5dfa: am f8af676f: am 71e839fd: am 01851b3e: Merge "LinearLayoutManager examples" into klp-modular-dev
* commit 'c1ae5dfad95b2874e6548971034b850149cbcefb':
2014-05-13 15:19:36 +00:00
Raphael Moll
a68462fb1b am 26c0fc91: am 7a058622: am 93421018: (-s ours) am de76aab8: am f03f35fe: Update support library version to 19.1.0.
* commit '26c0fc91962967164fac4ab6143c33f685cfbd4d':
2014-05-13 15:19:35 +00:00
Alan Viverette
2fff0abcd2 am abd2383d: am f210b1e3: Remove deprecated Gallery and ImageSwitcher from API Demos
* commit 'abd2383d3e3d73c8adba33e4dc62336e5114a849':
2014-05-13 15:19:33 +00:00
Alan Viverette
ebd51088a6 am 4794b17a: am f37ac856: Clean up DeviceDefault style in API Demos
* commit '4794b17a54df0264172409e07abc48866019251c':
2014-05-13 15:19:32 +00:00
Xavier Ducrohet
f39c6a2c74 am 7db1d2bd: am 6ee68fe3: am 6e211383: am 459fdbce: am dcb2c538: Add annotation support lib to SDK.
* commit '7db1d2bd7fa3857c90273bf6ebb32ffcf42ddd5c':
2014-05-13 15:19:31 +00:00
Andrew Hsieh
1aa309010c am b4bd34fa: am 36a95162: am cdd2af5f: am bf782628: Merge "Generate x86_64 symbols based on bionic 2014-03-19"
* commit 'b4bd34faf239ee13bc014176c498741d24a42bc8':
2014-05-13 15:19:30 +00:00
Andrew Hsieh
736c295545 am e34eb767: am 430c4b16: am 8c81d3b4: am 3000c633: Merge "Disable for a while extra warnings when using [v]sprintf"
* commit 'e34eb7672bbfe0b4ba2001821780211aef1dfdac':
2014-05-13 15:19:29 +00:00
Andrew Hsieh
f4eb6a2c94 am eea27c40: am ab8c4854: am fc8ba054: am 70537fd9: Merge "Fix x86_64 alignment in crtbegin"
* commit 'eea27c405925e5bf3487257bef85ce33818dcaae':
2014-05-13 15:19:28 +00:00
Tim Kilbourn
8925c46fd6 am 32842e2e: am 2a137224: am 939cafef: am 3baefeb5: Initial leanback sample code.
* commit '32842e2e69798913eafc89f819de5bd15918a419':
2014-05-13 15:19:27 +00:00
Andrew Hsieh
135f3cba59 am 047ca65c: am 839fc5d6: am c7e064b8: am 16636e4b: Merge "Refresh 64-bit headers and libs"
* commit '047ca65c2d41469a88c3b2aeba0f397d8d7a708c':
2014-05-13 15:19:25 +00:00
Tim Kilbourn
30b0d3c3b0 am 5d34a264: am cdb09c94: am 56c1077d: am c9d6af6b: Merge "Add the stub src dir to the leanback extras." into klp-modular-dev
* commit '5d34a26480701a6904cfb1d19069193d14a71031':
2014-05-13 15:19:24 +00:00
Guang Zhu
c4281fc9d1 am c8c42846: am 644b8222: blacklist KEYCODE_SLEEP in random key generation
* commit 'c8c42846c535add6d140134dd55ea8c773cbde35':
2014-05-13 15:19:23 +00:00
Adam Koch
adfd07d5bb am a5dba95f: am afe9bac9: am 4d5a7ace: am 87bd56ff: am 3a09d75f: am bdd20c5c: Merge "Remove bitmapfun code sample (it has moved to samples framework)." into klp-docs
* commit 'a5dba95f6ba28265eaa53590402794cf13798573':
2014-05-13 15:19:22 +00:00
Joe Fernandez
6a6d48930f am 83e4a660: am 75358434: am 225c000d: am 8a28dc4f: am b67283c0: am b378f58a: Merge "Adding production app.yaml to source control" into klp-docs
* commit '83e4a6604003943c58c0ea3403c8d4afe4a3ea68':
2014-05-13 15:19:20 +00:00
Ricardo Cervera
63facc8914 am 68800371: am f0ea1b0e: am 5a863c55: am 1aec60d4: am f203e028: am c861a265: Merge "docs: Modified sample descriptions for March sample push." into klp-docs
* commit '688003716b31bd1aec5173e7655ad36572223a22':
2014-05-13 15:19:19 +00:00
Alexander Lucas
7ad976f27d am 200c6fee: am ab05cdfb: am dd7dda23: am 964fa100: am 7ae2eca4: am 7a80e034: Merge "Added new samples to sdk.atree for march push" into klp-docs
* commit '200c6fee25076747d668dd7f1883471298f7b450':
2014-05-13 15:19:18 +00:00
Lorenzo Colitti
642cc28f05 am de3f7e75: am 1d069f3a: am aafbb735: am 8680138d: Merge "Add clatd test definitions to the testrunner."
* commit 'de3f7e75c681947a0c61d78e1c7813af6455a413':
2014-05-13 15:19:17 +00:00
Lorenzo Colitti
a051b69249 am d150a2c4: am 39e78884: am ccc445f6: am 20615c2b: Merge "Ensure that the native tests are run from /data/nativetest to match TF. Also cleanup a missing test from test_defs.xml"
* commit 'd150a2c4884aa1527042bf32ab72f9928875276a':
2014-05-13 15:19:16 +00:00
Adam Powell
8c12d212d6 am 48a6871f: am ff6ec86d: am a506acdd: am e3ac380a: Merge "Update RecyclerView sample to show use of ItemDecoration" into klp-modular-dev
* commit '48a6871f14ed2cfc61b0097594521347da97995b':
2014-05-13 15:19:15 +00:00
George Mount
0e161deacc am ccbda3b2: am ee6eedec: Merge "Undo inadvertent change to Transitions API demo."
* commit 'ccbda3b2fb06893d0ad8af67a78649f2697b283f':
2014-05-13 15:19:14 +00:00
Tim Kilbourn
d45cc6b4e9 am 933c03df: am 957fa659: resolved conflicts for merge of 9eecf3fc to master
* commit '933c03dfcf8ed170e9f2c40439dc20cc6536cfe2':
2014-05-13 15:19:12 +00:00
Trevor Johns
49c21b82b4 am 620f19af: am d43bf2c3: am f62824c6: am 9d563550: Merge "Align "from code" parent-child preference flow with "from XML""
* commit '620f19af47d7783151ce554d8cfe4d56fd543d07':
2014-05-13 15:19:11 +00:00
Alexander Lucas
b3c838208e am c98496f2: am dfc9958f: am 23f9bb62: am cd1255d1: am 4362d331: resolved conflicts for merge of 6da9c2ed to klp-ub-dev
* commit 'c98496f27a71f082b66b8c62bae8610fb3415410':
2014-05-13 15:19:10 +00:00
Alexander Lucas
7f88717b98 am 9536e114: am 19377d91: am d393b918: am 58c6156e: am 94f80bce: am a780ba4b: Adding browsable prebuilt samples for march push
* commit '9536e114689c96361afce0b1dd437b6d9dfee0aa':
2014-05-13 15:19:09 +00:00
Kristian Monsen
0b7e3e9260 am 312173e9: am 384a2fa5: All lines can be 100 cols according to the Android style guide
* commit '312173e9c22a06d1e9c868846e247623c7480208':
2014-05-13 15:19:08 +00:00
Evan Charlton
10163e76fc am 311e3662: Merge "Merging emulator smoke test projects" into master-nova
* commit '311e3662bdaec82c621fd3b04c4505ce60d2df15':
  Merging emulator smoke test projects
2014-05-13 15:19:06 +00:00
Alan Viverette
554cbe72e2 am 8f31accd: am 2178063c: Temporarily taking over API Demos v19 for Quantum demos
* commit '8f31accd3d5fd280ed55d2ff9f418e83d5507b57':
2014-05-13 15:19:05 +00:00