Commit Graph

14181 Commits

Author SHA1 Message Date
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
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
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
Xavier Ducrohet
354634b8bb am 129c2dbb: am 7a8cfbfd: am b63c1328: am 55089c32: Merge "Android SDK Windows USB driver: Glass PID."
* commit '129c2dbb8f8e8a0348c73091e425d413725d3d90':
2014-02-03 22:14:09 +00:00
George Mount
1b660cc9f2 am ca2b0f8c: Merge "Add PathAnimations ApiDemos."
* commit 'ca2b0f8c624379abfd841e85778449d71664a833':
  Add PathAnimations ApiDemos.
2014-02-03 14:09:57 -08:00
Xavier Ducrohet
129c2dbb8f am 7a8cfbfd: am b63c1328: am 55089c32: Merge "Android SDK Windows USB driver: Glass PID."
* commit '7a8cfbfd7fda79a0e16c0920d85a4644cf7f211d':
2014-02-03 14:09:56 -08:00
Raphael Moll
4f68a32ec9 am f2534edf: am 56142356: Merge "Update revision of Android SDK USB driver for Windows."
* commit 'f2534edf0eea09e5f5c09b02802bc69b79112f8f':
  Update revision of Android SDK USB driver for Windows.
2014-01-31 23:17:47 +00:00
Raphael Moll
f2534edf0e 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 15:12:35 -08:00
Xavier Ducrohet
e8e50cdc14 am 941fa37f: am 55089c32: Merge "Android SDK Windows USB driver: Glass PID."
* commit '941fa37fece66981f0384394d2ffa48fea8c0c5f':
  Android SDK Windows USB driver: Glass PID.
2014-01-31 16:52:01 +00:00
Xavier Ducrohet
941fa37fec am 55089c32: Merge "Android SDK Windows USB driver: Glass PID."
* commit '55089c32d599d2a7108e10728c59ad1f1b24384d':
  Android SDK Windows USB driver: Glass PID.
2014-01-31 08:46:10 -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
a37d71d9e5 am 0ef4b4b5: am d6968024: Merge "Add opt/net/wifi/service to eclipse .classpath"
* commit '0ef4b4b54f19480be25228e37b7eb4eeac4280dc':
  Add opt/net/wifi/service to eclipse .classpath
2014-01-31 06:07:36 +00:00
Yuhao Zheng
0ef4b4b54f am d6968024: Merge "Add opt/net/wifi/service to eclipse .classpath"
* commit 'd6968024410ba3a3c9c1f2161800cd8130d8ec2c':
  Add opt/net/wifi/service to eclipse .classpath
2014-01-30 22:04:09 -08:00
Yuhao Zheng
d696802441 Merge "Add opt/net/wifi/service to eclipse .classpath" 2014-01-31 06:01:09 +00:00