Commit Graph

14157 Commits

Author SHA1 Message Date
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
Steve Moyer
ce56aeeb4a am 1f055fa8: am eb2af6d3: am a775c5a0: Merge "Adding SmsTest to emulator"
* commit '1f055fa84529d22891fb8d1b55ef3f93d61771cd':
2014-05-13 15:18:40 +00:00
Steve Moyer
71fb1f94e4 am dfb99c4b: am a36bee2c: am f2d1d5f2: Merge "Add SMS test to verify emulator can receive sms from DDMS"
* commit 'dfb99c4bdddcb3a5b1b86c534554dcdb474fa0d0':
2014-05-13 15:18:39 +00:00
Alexander Lucas
6af7541a3f am c59a4e7a: am 50960708: am 93ca68b5: am 862cb15a: am 213b633f: am b58b3103: am 47be1a3b: am fc1c6987: Updated sdk.atree to include new samples for feb sample launch
* commit 'c59a4e7a17558088cd3c40e30123caf4e917d3e7':
2014-05-13 15:18:33 +00:00
Alexander Lucas
06ff334d90 am 2bc3855d: am 5c3d95c0: am 4a5d5ea3: am cf338de4: am 20adf6c4: am ec6c6683: am 743e1fd6: am 0b3758ea: Adding new samples to browseable section of DAC
* commit '2bc3855d0d1e070d5043d6f9ac68e0fbf3d41410':
2014-05-13 15:18:31 +00:00
Alexander Lucas
8fae27b784 am 7671d4f4: am 8e3cfac8: am 7c395c6a: am f252545b: am 2221254f: am bcb343c4: am 2e7cc5ae: am fc921036: incremented Pkg.Revision
* commit '7671d4f4e30fb2ab5970f251f66acae8b739d95c':
2014-05-13 15:18:30 +00:00
Andrew Hsieh
261b177467 am 7e2b83dd: am 3326967a: am 918402d4: am a8ddb1bc: am f0387da7: Merge "Rename arch-aarch64 to arch-arm64"
* commit '7e2b83ddbb8090c0ea00cb1a6ae357b1156c5c94':
2014-05-13 15:18:29 +00:00
Deepanshu Gupta
73d9374994 am 42424c95: am 9e2df044: am 819f19e6: am c6b9cf1d: am 25f6b164: am 31936361: am ce8ddf4f: am 0363ab1f: Merge "Bundle Noto fonts with the SDK" into klp-dev
* commit '42424c95b1f3caae4b59b82be98134ca44bdd7fe':
2014-05-13 15:18:28 +00:00
Andrew Hsieh
9d9792e450 am a230f472: am b47d1153: am 6cc4fd6f: am 2904af32: am 348f8889: Merge "Add missing __NDK_FPABI__ to function taking/returning float/double"
* commit 'a230f472ffd8664776a0c8741cf1b7c8cdd0a272':
2014-05-13 15:18:27 +00:00
Andrew Hsieh
a31eeda5f0 am c865441b: am 46c552a4: am f196c40f: am 784303c2: am 5d962bb6: Merge "Fixed apparent copy/paste mistake Bug: 11634373"
* commit 'c865441b901100101bcc494965645680bfdf5949':
2014-05-13 15:18:26 +00:00
George Mount
f38fac5f96 am d2f8b53d: am bbe0365f: am 77dfe829: Cross-Activity Scene transitions API demo.
* commit 'd2f8b53d8783ad0e785e9f534aa1d2791e6e9293':
2014-05-13 15:18:25 +00:00
Scott Main
70abb42dbf am 9a755344: am b7db96f7: am a8d44d8d: am 0964a13c: am 47ef3692: am 88147ca6: am a9de2b8e: am 01d72b37: redirect old google intents page to new common intents page
* commit '9a755344528f11dbdd9cdae9c2bd4ef068a3fde8':
2014-05-13 15:18:23 +00:00
Scott Main
fd93fb8e72 am 21457b58: am 253165ce: am 96bca006: am d9a4680d: am 0c2c7587: am 788cdd43: am 6ebae474: am 2e3e1da7: add redirect for removed samples page
* commit '21457b58f5ba2cea097078b790ec0609223c59ce':
2014-05-13 15:18:22 +00:00
Tim Murray
2f2c6a0dc7 am 50a35edc: am f75267c5: am 59775e12: am b812b74b: am 78133f53: Merge "Fix build"
* commit '50a35edc3f1c9d1cc3b53ada48e1dfee2c994c1b':
2014-05-13 15:18:21 +00:00
George Mount
a05e475da5 am 57ccde5f: am 7e7300ba: am 971f7a93: Merge "Revert "Add Trim Path API demo.""
* commit '57ccde5f0322c4465c28fa87bfcee03d894d26bd':
2014-05-13 15:18:19 +00:00
Raphael Moll
62a0e1d0ea am 14b8c08b: am 7abef20d: am 95410fd8: am 273f790b: am 56142356: Merge "Update revision of Android SDK USB driver for Windows."
* commit '14b8c08b312c0ce79d04f96a648a4a79fa3676a1':
2014-05-13 15:18:17 +00:00
George Mount
2c821d6c58 am 43c6d241: am 1b660cc9: am ca2b0f8c: Merge "Add PathAnimations ApiDemos."
* commit '43c6d241a99a5117a0bbea7a9b78dd3568aacefb':
2014-05-13 15:18:15 +00:00
Xavier Ducrohet
1685375430 am 354634b8: am 129c2dbb: am 7a8cfbfd: am b63c1328: am 55089c32: Merge "Android SDK Windows USB driver: Glass PID."
* commit '354634b8bbd4dc8a15dd91082d4debfb57257c81':
2014-05-13 15:18:14 +00:00
Raphael Moll
5970a9965f am 4f68a32e: am f2534edf: am 56142356: Merge "Update revision of Android SDK USB driver for Windows."
* commit '4f68a32ec97f1b4ca2722ef53e88c4932c34af4a':
2014-05-13 15:18:12 +00:00
Xavier Ducrohet
606194609a am e8e50cdc: am 941fa37f: am 55089c32: Merge "Android SDK Windows USB driver: Glass PID."
* commit 'e8e50cdc147579eb4dc90a6067f8fb496b2e5665':
2014-05-13 15:18:11 +00:00
Yuhao Zheng
7cc26de188 am a37d71d9: am 0ef4b4b5: am d6968024: Merge "Add opt/net/wifi/service to eclipse .classpath"
* commit 'a37d71d9e529755073d17cac6b8a8e342d681684':
2014-05-13 15:18:09 +00:00
Raphael Moll
eaccb2befc am e0cda8e2: (-s ours) am fd60d825: am 56a36649: Update revision of Android SDK USB driver for Windows. DO NOT MERGE.
* commit 'e0cda8e2327effe5acf408af86e4bd756e6c4f71':
2014-05-13 15:18:08 +00:00
Raphael Moll
2792367f9a am 575a6c1e: (-s ours) am 246169c6: am 068a00f8: Android SDK Windows USB driver: Glass PID. DO NOT MERGE.
* commit '575a6c1ebe879eb31c36d19b8672296ac9c557dd':
2014-05-13 15:18:06 +00:00
Adam Powell
4e3d6678c8 am 867992ed: am d9dbe909: am 620877f3: am b9767caa: Updated Support7Demos to follow RecyclerView API changes
* commit '867992edcda0863e3d7071598c87b56824c17903':
2014-05-13 15:18:05 +00:00