Commit Graph

14480 Commits

Author SHA1 Message Date
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
Tsu Chiang Chuang
c7dcf85435 am 4a64e0a0: am 3a5fd7be: Merge "Ensure that the native tests are run from /data/nativetest to match TF. Also cleanup a missing test from test_defs.xml"
* commit '4a64e0a01523752115af757dad8f020cb92e34c8':
2014-05-13 15:19:03 +00:00
George Mount
00dd43cc6e am 96cd10b0: am 4769ecc7: Support changes in Scene Activity Transition API redo.
* commit '96cd10b02c770d8fedc73dee6be5ace49b336cb7':
2014-05-13 15:19:02 +00:00
George Mount
7ff3f2ca03 am 266a2d8a: am 1b3da374: Revert "Support changes in Scene Activity Transition API."
* commit '266a2d8a63835025258c75cc2b397aa715285891':
2014-05-13 15:19:01 +00:00
George Mount
4d5851846b am 0e493e09: am c2796884: Fix build breakage due to failed import.
* commit '0e493e0972e150cba125725444df5e24f5bccf95':
2014-05-13 15:19:00 +00:00
Andrew Hsieh
51de3747b6 am 9a7cc7e3: am 82b184ce: am 91925f1f: am c046b48b: Merge "Add scalbln, scalblnf, and scalblnl to x86 libm.so for API>=18"
* commit '9a7cc7e325215259fc1701d7f17423707f61a557':
2014-05-13 15:18:58 +00:00
George Mount
0ca3a872ee am a15d7ad8: am 7f50268c: Merge "Support changes in Scene Activity Transition API."
* commit 'a15d7ad81908753a6b84acd1fa048e0e2b26939e':
2014-05-13 15:18:57 +00:00
Adam Powell
4d4fe49878 am 0849aa28: am f1a9c758: am 93e80848: am ff08b2c1: Update Support7Demos for RecyclerView API change
* commit '0849aa28801332805d8f495e0599c9b7f524fe8f':
2014-05-13 15:18:56 +00:00
Igor Murashkin
7e3fa8fbd9 am d8066121: am 14e3c5ab: Merge "classpath: add renderscript source directory"
* commit 'd8066121c1a9ab87a11e873ca9062cd69da52bc0':
2014-05-13 15:18:55 +00:00
Andrew Hsieh
759c00c135 am b900b270: am e578e028: am 8aa4464c: am fea707ac: Merge "Define __PTHREAD_*_INIT_VLAUE in pthread.h for API < 9"
* commit 'b900b270030555398a44e378555e252f4a2e2660':
2014-05-13 15:18:54 +00:00
Andrew Hsieh
ff0f5ed99e am 3881c336: am 5481fd19: am 075ea66c: am a32687f4: Merge "Fix MIPS\' struct stat"
* commit '3881c336df9f1c0a7f3ad97efdeda176ba785cd1':
2014-05-13 15:18:52 +00:00
Elliott Hughes
bd7471a524 am 9f11a471: am b93b0e5c: am 4683d846: am 1fe277e4: Merge "Insulate libportable from bionic changes."
* commit '9f11a471e1878376d3ef9aa2c2324ef7c13f0451':
2014-05-13 15:18:51 +00:00
Baligh Uddin
31078f7fbd am 3b842a86: keep history after reset to master-nova-dev
* commit '3b842a8628da809286b810b6881e382890ead1f6':
2014-05-13 15:18:49 +00:00
Steve Moyer
15aa7eb55f am 6360c53f: am c36faf6c: am 37fb58b9: Merge "Add up to 6 10 second delays to wait for sms"
* commit '6360c53fd0e8598e971c7365e49c4e68eb09f87a':
2014-05-13 15:18:47 +00:00
Andrew Hsieh
0eda8a786f am 6f013be0: am de38dc72: am 1556d399: am 5624f5b9: am 1c513253: Merge "Experimental headers/libs"
* commit '6f013be090fcbec5e36c5a7bce98728373c8dcc1':
2014-05-13 15:18:46 +00:00
Adam Powell
edc164a5bd am 64c8c2d5: am 680e0577: am 882beee7: am db120dbb: am 8c433780: Update Support7Demos for new RecyclerView additions
* commit '64c8c2d5b86a14ace018d0ea5a04f4bfccbb63b1':
2014-05-13 15:18:45 +00:00
Dirk Dougherty
67ac21672c am 2fe64813: am 5ea03253: am a7256971: am cb364091: am db65481d: am 11d0bcd8: am dc436c20: am 7cd4524c: Update summary descriptions for new samples.
* commit '2fe64813745bd24ce4f51e25a522a41ae1bdcc6b':
2014-05-13 15:18:44 +00:00
Steve Moyer
655560a358 am 78ac5ddf: am 8ff9df77: am a7524da8: Adding test tag to sms test
* commit '78ac5ddf437786de017fe947a7234cf88c388951':
2014-05-13 15:18:43 +00:00
Andrew Hsieh
9630678411 am 0e26468e: am 16573690: am 2146151b: am 2277387d: am d645d2f8: Merge "Move sys/cachectl.h up from mips-specific folder"
* commit '0e26468eaf24335b6f4f7237e6e9f83336360e38':
2014-05-13 15:18:42 +00:00