Commit Graph

13497 Commits

Author SHA1 Message Date
Deepanshu Gupta
42424c95b1 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 '9e2df044ec6c4cd23994aa0983a9af55ed1f6b81':
  Bundle Noto fonts with the SDK
2014-02-06 03:34:10 +00:00
Deepanshu Gupta
9e2df044ec am 819f19e6: am c6b9cf1d: am 25f6b164: am 31936361: am ce8ddf4f: am 0363ab1f: Merge "Bundle Noto fonts with the SDK" into klp-dev
* commit '819f19e62fa1159edae23865ce54476afb299e5c':
  Bundle Noto fonts with the SDK
2014-02-05 19:31:58 -08:00
Deepanshu Gupta
819f19e62f am c6b9cf1d: am 25f6b164: am 31936361: am ce8ddf4f: am 0363ab1f: Merge "Bundle Noto fonts with the SDK" into klp-dev
* commit 'c6b9cf1dddff4b3c8a9574cac5efbbcc334300b3':
  Bundle Noto fonts with the SDK
2014-02-06 03:29:49 +00:00
Deepanshu Gupta
c6b9cf1ddd am 25f6b164: am 31936361: am ce8ddf4f: am 0363ab1f: Merge "Bundle Noto fonts with the SDK" into klp-dev
* commit '25f6b164c3a295ec86e832615611f61333d9db4b':
  Bundle Noto fonts with the SDK
2014-02-06 03:11:28 +00:00
Deepanshu Gupta
25f6b164c3 am 31936361: am ce8ddf4f: am 0363ab1f: Merge "Bundle Noto fonts with the SDK" into klp-dev
* commit '319363611c44320a263e5bce675f2eb558862550':
  Bundle Noto fonts with the SDK
2014-02-06 03:07:57 +00:00
Deepanshu Gupta
319363611c am ce8ddf4f: am 0363ab1f: Merge "Bundle Noto fonts with the SDK" into klp-dev
* commit 'ce8ddf4f8af5228e3d36987a8d0d5a9b030e785d':
  Bundle Noto fonts with the SDK
2014-02-06 03:03:44 +00:00
Deepanshu Gupta
ce8ddf4f8a am 0363ab1f: Merge "Bundle Noto fonts with the SDK" into klp-dev
* commit '0363ab1f746943cd78a439d891e8f9b0a0b92214':
  Bundle Noto fonts with the SDK
2014-02-06 03:00:54 +00:00
Deepanshu Gupta
0363ab1f74 Merge "Bundle Noto fonts with the SDK" into klp-dev 2014-02-06 02:05:06 +00:00
Andrew Hsieh
a230f472ff am b47d1153: am 6cc4fd6f: am 2904af32: am 348f8889: Merge "Add missing __NDK_FPABI__ to function taking/returning float/double"
* commit 'b47d1153390f20b4c7a7d00526a1ec09c3d7bc2a':
  Add missing __NDK_FPABI__ to function taking/returning float/double
2014-02-05 03:47:04 +00:00
Andrew Hsieh
b47d115339 am 6cc4fd6f: am 2904af32: am 348f8889: Merge "Add missing __NDK_FPABI__ to function taking/returning float/double"
* commit '6cc4fd6fe47d05db2060138e756d9055c94a66b7':
  Add missing __NDK_FPABI__ to function taking/returning float/double
2014-02-04 19:44:37 -08:00
Andrew Hsieh
c865441b90 am 46c552a4: am f196c40f: am 784303c2: am 5d962bb6: Merge "Fixed apparent copy/paste mistake Bug: 11634373"
* commit '46c552a4aaabd3c80e3fef76f9900e6fff1ebf8f':
  Fixed apparent copy/paste mistake Bug: 11634373
2014-02-05 03:42:52 +00:00
Andrew Hsieh
6cc4fd6fe4 am 2904af32: am 348f8889: Merge "Add missing __NDK_FPABI__ to function taking/returning float/double"
* commit '2904af32e879ef15c22f6329799e6c25a5bda624':
  Add missing __NDK_FPABI__ to function taking/returning float/double
2014-02-05 03:41:54 +00:00
Andrew Hsieh
46c552a4aa am f196c40f: am 784303c2: am 5d962bb6: Merge "Fixed apparent copy/paste mistake Bug: 11634373"
* commit 'f196c40feb816a6a3a9d0e7b19cfcdb89b1a7a8e':
  Fixed apparent copy/paste mistake Bug: 11634373
2014-02-04 19:40:15 -08:00
Andrew Hsieh
2904af32e8 am 348f8889: Merge "Add missing __NDK_FPABI__ to function taking/returning float/double"
* commit '348f88899f47fecd61b470fd7b4b64b069bf70a8':
  Add missing __NDK_FPABI__ to function taking/returning float/double
2014-02-05 03:38:16 +00:00
Andrew Hsieh
f196c40feb am 784303c2: am 5d962bb6: Merge "Fixed apparent copy/paste mistake Bug: 11634373"
* commit '784303c20b50c580aa54a82be2f845320026b4d2':
  Fixed apparent copy/paste mistake Bug: 11634373
2014-02-05 03:37:22 +00:00
Andrew Hsieh
784303c20b am 5d962bb6: Merge "Fixed apparent copy/paste mistake Bug: 11634373"
* commit '5d962bb6bd51200d090a6f5c7256112eaffae44b':
  Fixed apparent copy/paste mistake Bug: 11634373
2014-02-05 03:32:46 +00:00
Andrew Hsieh
348f88899f Merge "Add missing __NDK_FPABI__ to function taking/returning float/double" 2014-02-05 03:32:42 +00:00
Andrew Hsieh
3bf77d0608 Add missing __NDK_FPABI__ to function taking/returning float/double
See 5881b5cbe7 (which missed
android-18 input.h) for details.

Change-Id: Ib23d85b676177b0a3e15bae957fc48f6ef0ededb
2014-02-05 11:30:29 +08:00
Andrew Hsieh
5d962bb6bd Merge "Fixed apparent copy/paste mistake Bug: 11634373" 2014-02-05 03:27:05 +00:00
David Friedman
3b601c6550 Fixed apparent copy/paste mistake
Bug: 11634373

Change-Id: I44766217f414988bfd3be68043a4b80dd21554d8
2014-02-05 11:18:32 +08:00
George Mount
d2f8b53d87 am bbe0365f: am 77dfe829: Cross-Activity Scene transitions API demo.
* commit 'bbe0365f67d7e8146e65c6b57fee20d32f2e4089':
  Cross-Activity Scene transitions API demo.
2014-02-05 00:57:47 +00:00
George Mount
bbe0365f67 am 77dfe829: Cross-Activity Scene transitions API demo.
* commit '77dfe829d14f9d254f0b535e9bf4dd382e1c9c61':
  Cross-Activity Scene transitions API demo.
2014-02-04 16:55:35 -08:00
George Mount
77dfe829d1 Cross-Activity Scene transitions API demo.
Change-Id: Icd644902b61ca2f03f21045bfad3a758075fb7cc
2014-02-04 15:53:02 -08:00
Scott Main
9a75534452 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 'b7db96f7892f9e958e06561dde066f3ba1ab0db7':
  redirect old google intents page to new common intents page
2014-02-04 19:42:19 +00:00
Scott Main
b7db96f789 am a8d44d8d: am 0964a13c: am 47ef3692: am 88147ca6: am a9de2b8e: am 01d72b37: redirect old google intents page to new common intents page
* commit 'a8d44d8dbdb76cdf95f070f1d21c0cf31d5d1632':
  redirect old google intents page to new common intents page
2014-02-04 11:39:21 -08:00
Scott Main
a8d44d8dbd am 0964a13c: am 47ef3692: am 88147ca6: am a9de2b8e: am 01d72b37: redirect old google intents page to new common intents page
* commit '0964a13c8c8a0681d44721eee429169cc133b941':
  redirect old google intents page to new common intents page
2014-02-04 19:37:16 +00:00
Scott Main
0964a13c8c am 47ef3692: am 88147ca6: am a9de2b8e: am 01d72b37: redirect old google intents page to new common intents page
* commit '47ef36923cf7843a13e102658972ebb892159951':
  redirect old google intents page to new common intents page
2014-02-04 19:28:45 +00:00
Scott Main
47ef36923c am 88147ca6: am a9de2b8e: am 01d72b37: redirect old google intents page to new common intents page
* commit '88147ca63967094c34792c451f9cbc1e9fd68466':
  redirect old google intents page to new common intents page
2014-02-04 19:25:50 +00:00
Scott Main
88147ca639 am a9de2b8e: am 01d72b37: redirect old google intents page to new common intents page
* commit 'a9de2b8e0e04b1333126a0131570c03dc4b09610':
  redirect old google intents page to new common intents page
2014-02-04 19:23:32 +00:00
Scott Main
a9de2b8e0e am 01d72b37: redirect old google intents page to new common intents page
* commit '01d72b37a87ce8781cd35d5aaa834b508f964be7':
  redirect old google intents page to new common intents page
2014-02-04 19:19:24 +00:00
Scott Main
01d72b37a8 redirect old google intents page to new common intents page
Change-Id: Iac645c2f3094fa8d362ac6a2bacdbafdd1e36b08
2014-02-04 19:16:24 +00:00
Scott Main
21457b58f5 am 253165ce: am 96bca006: am d9a4680d: am 0c2c7587: am 788cdd43: am 6ebae474: am 2e3e1da7: add redirect for removed samples page
* commit '253165cea10e8344c2ca90c73104c95a3736b90d':
  add redirect for removed samples page
2014-02-04 19:10:09 +00:00
Scott Main
253165cea1 am 96bca006: am d9a4680d: am 0c2c7587: am 788cdd43: am 6ebae474: am 2e3e1da7: add redirect for removed samples page
* commit '96bca006c457fcd2bece48be66a598fd76d54965':
  add redirect for removed samples page
2014-02-04 11:07:03 -08:00
Scott Main
96bca006c4 am d9a4680d: am 0c2c7587: am 788cdd43: am 6ebae474: am 2e3e1da7: add redirect for removed samples page
* commit 'd9a4680defa6815e2d4716f73b784ea990011d35':
  add redirect for removed samples page
2014-02-04 19:03:06 +00:00
Scott Main
d9a4680def am 0c2c7587: am 788cdd43: am 6ebae474: am 2e3e1da7: add redirect for removed samples page
* commit '0c2c7587d0852231a24ccd2a4f2749633b16e068':
  add redirect for removed samples page
2014-02-04 18:55:22 +00:00
Scott Main
0c2c7587d0 am 788cdd43: am 6ebae474: am 2e3e1da7: add redirect for removed samples page
* commit '788cdd4335a0bd6cbe4b6efd0d7abf8139bdd6b5':
  add redirect for removed samples page
2014-02-04 18:54:08 +00:00
Scott Main
788cdd4335 am 6ebae474: am 2e3e1da7: add redirect for removed samples page
* commit '6ebae4742c92daecf18a3a3f1bfbc125c522bd44':
  add redirect for removed samples page
2014-02-04 18:51:39 +00:00
Scott Main
6ebae4742c am 2e3e1da7: add redirect for removed samples page
* commit '2e3e1da7ac58c7e9cdc47541553110864ec931a7':
  add redirect for removed samples page
2014-02-04 18:49:30 +00:00
Scott Main
2e3e1da7ac add redirect for removed samples page
Change-Id: I918d2c501ae9be881d578cda03218db6317cbcb6
2014-02-04 10:46:52 -08:00
Tim Murray
50a35edc3f am f75267c5: am 59775e12: am b812b74b: am 78133f53: Merge "Fix build"
* commit 'f75267c553f107649628112b3dee37a9e9930c28':
  Fix build
2014-02-03 23:49:38 +00:00
Tim Murray
f75267c553 am 59775e12: am b812b74b: am 78133f53: Merge "Fix build"
* commit '59775e126f04454e8e83f47205765068b7db5b4a':
  Fix build
2014-02-03 15:46:22 -08:00
Tim Murray
59775e126f am b812b74b: am 78133f53: Merge "Fix build"
* commit 'b812b74be9961d6bcdc6d0eacff3831fbf452378':
  Fix build
2014-02-03 23:43:56 +00:00
Tim Murray
b812b74be9 am 78133f53: Merge "Fix build"
* commit '78133f5323f110b574a471e37a560e90d7213481':
  Fix build
2014-02-03 23:37:55 +00:00
George Mount
57ccde5f03 am 7e7300ba: am 971f7a93: Merge "Revert "Add Trim Path API demo.""
* commit '7e7300ba8189875155c9f420fb3dd44cd056603a':
  Revert "Add Trim Path API demo."
2014-02-03 23:36:46 +00:00
Raphael Moll
14b8c08b31 am 7abef20d: am 95410fd8: am 273f790b: am 56142356: Merge "Update revision of Android SDK USB driver for Windows."
* commit '7abef20d376e8b7ec79f77938ca7bc543b85a35b':
2014-02-03 23:36:45 +00:00
Tim Murray
78133f5323 Merge "Fix build" 2014-02-03 23:31:54 +00:00
George Mount
7e7300ba81 am 971f7a93: Merge "Revert "Add Trim Path API demo.""
* commit '971f7a937246e8f84a6a217bf1aa15b5a5ef39c2':
  Revert "Add Trim Path API demo."
2014-02-03 15:31:26 -08:00
Raphael Moll
7abef20d37 am 95410fd8: am 273f790b: am 56142356: Merge "Update revision of Android SDK USB driver for Windows."
* commit '95410fd8b96f00268f732e4e46b1df7ba96a67d2':
2014-02-03 15:31:25 -08:00
Nick Kralevich
720b4e94e5 Fix build
This was broken due to 390ec00c6693fb20004f357901beae919a79329f
in frameworks/base

Change-Id: Ieaff5f34ef56efdd492af2f2e7c2294448223616
2014-02-03 15:25:34 -08:00
George Mount
43c6d241a9 am 1b660cc9: am ca2b0f8c: Merge "Add PathAnimations ApiDemos."
* commit '1b660cc9f2fa9c0ce47494f1c6429fe0b750242f':
  Add PathAnimations ApiDemos.
2014-02-03 22:14:10 +00:00