Commit Graph

13481 Commits

Author SHA1 Message Date
Alexander Lucas
47be1a3bea am fc1c6987: Updated sdk.atree to include new samples for feb sample launch
* commit 'fc1c69874c3edb0c9ea9ba0dbbec1507a3268a96':
  Updated sdk.atree to include new samples for feb sample launch
2014-02-08 00:32:12 +00:00
Alexander Lucas
743e1fd6ad am 0b3758ea: Adding new samples to browseable section of DAC
* commit '0b3758ea4e53f9bfd0b112eaa4a7dd7b7f4040f5':
  Adding new samples to browseable section of DAC
2014-02-07 23:32:32 +00:00
Alexander Lucas
2e7cc5ae7c am fc921036: incremented Pkg.Revision
* commit 'fc921036c38d1b88c2e8534e6a41db9b7ad092f4':
  incremented Pkg.Revision
2014-02-07 21:43:45 +00:00
Alexander Lucas
0b3758ea4e Adding new samples to browseable section of DAC
Change-Id: I58e10e787f5df668331fc04e97a6c2efcd75f76f
2014-02-07 13:17:23 -08:00
Andrew Hsieh
918402d4fd am a8ddb1bc: am f0387da7: Merge "Rename arch-aarch64 to arch-arm64"
* commit 'a8ddb1bcd5d01b2a9c395daf0b171aa0c50fefa4':
  Rename arch-aarch64 to arch-arm64
2014-02-06 23:06:45 +00:00
Andrew Hsieh
a8ddb1bcd5 am f0387da7: Merge "Rename arch-aarch64 to arch-arm64"
* commit 'f0387da709d79da5fc857fe9abf5bd1857784442':
  Rename arch-aarch64 to arch-arm64
2014-02-06 23:02:08 +00:00
Andrew Hsieh
f0387da709 Merge "Rename arch-aarch64 to arch-arm64" 2014-02-06 22:57:34 +00:00
Alexander Lucas
fc1c69874c Updated sdk.atree to include new samples for feb sample launch
Change-Id: I71af239a0bf0f146345e243720d9e4300c5ed1f6
2014-02-06 14:45:32 -08:00
Alexander Lucas
fc921036c3 incremented Pkg.Revision
Change-Id: Idb5497398525887a1f05dac421b0bd83de046a89
2014-02-06 12:53:37 -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
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
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
77dfe829d1 Cross-Activity Scene transitions API demo.
Change-Id: Icd644902b61ca2f03f21045bfad3a758075fb7cc
2014-02-04 15:53:02 -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
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
Andrew Hsieh
4618dc6c2a Rename arch-aarch64 to arch-arm64
Build instruction:
  ./build/tools/download-toolchain-sources.sh /tmp/ndk-$USER/src
  ./build/tools/gen-platforms.sh --minimal --dst-dir=$NDK \
     --ndk-dir=$NDK --overlay --arch=arm64
  ./build/tools/build-gcc.sh /tmp/ndk-$USER/src $NDK \
     aarch64-linux-android-4.8 --try-64

Change-Id: Ieaac9908cd2121981e257113cb8d5d3575c8718e
2014-02-04 17:36:55 +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
Tim Murray
78133f5323 Merge "Fix build" 2014-02-03 23:31:54 +00: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
971f7a9372 Merge "Revert "Add Trim Path API demo."" 2014-01-31 16:27:16 +00:00
Raphael Moll
95410fd8b9 am 273f790b: am 56142356: Merge "Update revision of Android SDK USB driver for Windows."
* commit '273f790b6b2dd354c9df2751e2f96074c1bbfd55':
  Update revision of Android SDK USB driver for Windows.
2014-01-31 16:26:42 +00:00
George Mount
bfe084a225 Revert "Add Trim Path API demo."
Bug 12489442

This reverts commit fad0b21946.

Change-Id: I527d0927bf891fc9570e860c158a352e1767474c
2014-01-31 07:23:11 -08:00
George Mount
ca2b0f8c62 Merge "Add PathAnimations ApiDemos." 2014-01-31 15:21:10 +00:00
Xavier Ducrohet
7a8cfbfd7f am b63c1328: am 55089c32: Merge "Android SDK Windows USB driver: Glass PID."
* commit 'b63c13281078137e5ae2743af2b34f8f1295c69f':
  Android SDK Windows USB driver: Glass PID.
2014-01-31 14:51:01 +00:00
Raphael Moll
273f790b6b am 56142356: Merge "Update revision of Android SDK USB driver for Windows."
* commit '561423569c11698698450b87a91c7a94d5077e5f':
  Update revision of Android SDK USB driver for Windows.
2014-01-31 12:17:13 +00:00
Xavier Ducrohet
b63c132810 am 55089c32: Merge "Android SDK Windows USB driver: Glass PID."
* commit '55089c32d599d2a7108e10728c59ad1f1b24384d':
  Android SDK Windows USB driver: Glass PID.
2014-01-31 10:26:49 +00:00
Yuhao Zheng
d696802441 Merge "Add opt/net/wifi/service to eclipse .classpath" 2014-01-31 06:01:09 +00:00
Raphael Moll
56a3664913 Update revision of Android SDK USB driver for Windows. DO NOT MERGE.
Rev 9 adds the Glass PID.

(Merged from AOSP 8221674986)
Change-Id: I1ec7985b9715d813f6442dad41a27233d8dd4822
2014-01-30 12:27:18 -08:00