Commit Graph

10122 Commits

Author SHA1 Message Date
Xavier Ducrohet
78f6f9b1f3 Merge "Add Mips support to SDK." 2012-08-02 17:04:19 -07:00
The Android Open Source Project
215695fe5e Reconcile with jb-mr0-release - do not merge
Change-Id: I5fffe5e9074ea03b0b9b31cde72dc4d6676f730a
2012-07-31 14:47:51 -07:00
The Android Automerger
2fd2eacf1c merge in jb-mr0-release history after reset to jb-dev 2012-07-31 14:07:07 -07:00
SangWook Han
ac8ed5e089 Use uintptr_t for cast pointer to integer.
On 64bit host, sizeof pointer is not equal to sizeof int.
	Need for host tools.

Change-Id: I848ceb878b873e6764a077e8a4ee31e756f30017
2012-07-31 11:02:59 +09:00
Scott Main
1fc6c8dd48 am a3ba2ea7: Merge "docs: quotes in comments apparently crash the server" into jb-dev
* commit 'a3ba2ea7251756425ae4a076126a1d73de6fe0a4':
  docs: quotes in comments apparently crash the server
2012-07-30 14:12:19 -07:00
Scott Main
a3ba2ea725 Merge "docs: quotes in comments apparently crash the server" into jb-dev 2012-07-30 14:10:19 -07:00
The Android Open Source Project
f3c5b01d6d Reconcile with jb-mr0-release jb-release
Change-Id: I64ab1cee03a49427cd6fe1468f984cd3c113d8b1
2012-07-27 14:50:18 -07:00
The Android Automerger
dd89937aa3 merge in jb-mr0-release history after reset to jb-dev 2012-07-26 17:49:27 -07:00
Scott Main
f4ac8bb21d docs: quotes in comments apparently crash the server
Change-Id: Ie0b47ccde141cb7ffdf243de20411bffbf94fa41
2012-07-26 15:54:19 -07:00
Scott Main
1aeb3525e1 am 3a76c1fd: Merge "docs: move all ZIP files for training classes here, originally from the html/shareables/ directory to save space on the developer site." into jb-dev
* commit '3a76c1fd1b99c7c2f6df19ec54d4948c9dd1b204':
  docs: move all ZIP files for training classes here, originally from the html/shareables/ directory to save space on the developer site.
2012-07-26 15:41:33 -07:00
Scott Main
3a76c1fd1b Merge "docs: move all ZIP files for training classes here, originally from the html/shareables/ directory to save space on the developer site." into jb-dev 2012-07-26 15:39:44 -07:00
Xavier Ducrohet
efce10c7f8 am 6ca669e4: Merge "Update support lib to r10." into jb-dev
* commit '6ca669e435e3f2dd8dfc084d318b856bcaa1f9a7':
  Update support lib to r10.
2012-07-26 13:17:01 -07:00
Xavier Ducrohet
6ca669e435 Merge "Update support lib to r10." into jb-dev 2012-07-26 13:15:21 -07:00
Xavier Ducrohet
2a7c34af40 Update support lib to r10.
Change-Id: Ic0c4546566c237cda17d3e4820554424e0e885dd
2012-07-26 13:14:51 -07:00
Andrew Hsieh
123f27e9fd am 21f8a3c5: Merge "Add comments about why "call" instead of "jump" is used."
* commit '21f8a3c51d15c3d270be3923f518e047eaee6d04':
  Add comments about why "call" instead of "jump" is used.
2012-07-25 22:22:17 -07:00
Andrew Hsieh
21f8a3c51d Merge "Add comments about why "call" instead of "jump" is used." 2012-07-25 16:04:53 -07:00
Andrew Hsieh
e395327a7c Add comments about why "call" instead of "jump" is used.
Related CL: https://android-review.googlesource.com/#/c/38651

Change-Id: I425e06f08fda90501a686c7e437d4e70fc1e4a1b
2012-07-25 15:39:00 -07:00
Scott Main
d0f75a5ae3 docs: move all ZIP files for training classes here, originally
from the html/shareables/ directory to save space on the developer site.

Change-Id: I545e0002215b17aa0a2e8e261591652046308210
2012-07-25 14:51:20 -07:00
Scott Main
fa25119081 am d25c7917: Merge "docs: add redirect for l10n tutorial and fix a couple others" into jb-dev
* commit 'd25c7917b0f90a71a72842b17475744480d4096e':
  docs: add redirect for l10n tutorial and fix a couple others
2012-07-25 14:39:58 -07:00
Scott Main
d25c7917b0 Merge "docs: add redirect for l10n tutorial and fix a couple others" into jb-dev 2012-07-25 14:37:49 -07:00
Scott Main
cdfe5ccf4e docs: add redirect for l10n tutorial and fix a couple others
Change-Id: Ifd8bfdcfb7c0412cc75a4e77736b7ead978f6635
2012-07-25 12:54:41 -07:00
The Android Automerger
f89fa747e6 merge in jb-release history after reset to jb-dev 2012-07-24 20:23:09 -07:00
The Android Automerger
fab8424220 merge in jb-mr0-release history after reset to jb-dev 2012-07-24 12:39:24 -07:00
Xavier Ducrohet
3558deb1d3 am cfa5aac7: Update the SDK platform tools package to revision 14.
* commit 'cfa5aac721b6e5d05ababa3a7643559624ceac01':
  Update the SDK platform tools package to revision 14.
2012-07-19 14:33:06 -07:00
Xavier Ducrohet
cfa5aac721 Update the SDK platform tools package to revision 14.
Change-Id: Iaf6fa70f8cccce8ba8ecbb5121cf380e69c6b8fb
2012-07-19 13:33:26 -07:00
Colin Cross
643dc19d88 am e592bc7c: Merge "Add libsparse to sdk whitelist"
* commit 'e592bc7c065a45ff6be63b09ac167dcf32a01bb7':
  Add libsparse to sdk whitelist
2012-07-19 11:55:38 -07:00
Colin Cross
e592bc7c06 Merge "Add libsparse to sdk whitelist" 2012-07-19 11:48:32 -07:00
The Android Open Source Project
aafb46093d Reconcile with jb-mr0-release jb-release
Change-Id: I10c1743cce5380ca689dee0dad605ec2b3b43799
2012-07-19 08:36:18 -07:00
The Android Automerger
fd3470f9a3 merge in jb-release history after reset to jb-dev 2012-07-18 23:04:37 -07:00
Wink Saville
4e0dd447a6 am 0275bc68: (-s ours) Use telephony-common and mms-common. - DO NOT MERGE
* commit '0275bc68eae54a882bb27e534ca401fad3acc663':
  Use telephony-common and mms-common. - DO NOT MERGE
2012-07-17 12:33:23 -07:00
The Android Automerger
0ce32aeb2e merge in jb-mr0-release history after reset to jb-dev 2012-07-17 12:29:38 -07:00
Wink Saville
0275bc68ea Use telephony-common and mms-common. - DO NOT MERGE
Change-Id: If2e6b49eb9ceafc43de107ce761163c654f3ee35
2012-07-17 12:23:03 -07:00
Xavier Ducrohet
2fb22b2c8b am c8b44d4c: Update SDK platform-tools revision to 13.
* commit 'c8b44d4ceeb110b5c836e7a3ee5a1f1ed905d975':
  Update SDK platform-tools revision to 13.
2012-07-16 11:14:13 -07:00
Xavier Ducrohet
c8b44d4cee Update SDK platform-tools revision to 13.
Change-Id: I0eefe31df11e31892f3574c1f8c05025b766b4e1
2012-07-13 16:21:28 -07:00
Colin Cross
c52fe389d5 Add libsparse to sdk whitelist
Add libsparse to the sdk whitelist so fastboot can link against it on
windows.

Change-Id: I9c78d99842cb48f970669b1e7421cb5f98e47555
2012-07-13 14:26:34 -07:00
Xavier Ducrohet
2507de80fa Move SDK system image package to rev 2.
Change-Id: I58be9742ccca65e72de381e07ac31e11f729a404
2012-07-12 17:25:56 -07:00
Xavier Ducrohet
d3efe8aa32 am 51ea9221: Move SDK system image package to rev 2.
* commit '51ea9221e62b147939b14ab9fe1852c3f67bec90':
  Move SDK system image package to rev 2.
2012-07-12 16:17:06 -07:00
Xavier Ducrohet
51ea9221e6 Move SDK system image package to rev 2.
Change-Id: I58be9742ccca65e72de381e07ac31e11f729a404
2012-07-12 16:14:46 -07:00
The Android Automerger
9115e9a11d merge in jb-mr0-release history after reset to jb-dev 2012-07-11 23:12:01 -07:00
Wink Saville
e8617bccd0 Use telephony-common and mms-common.
Change-Id: If2e6b49eb9ceafc43de107ce761163c654f3ee35
2012-07-11 14:57:38 -07:00
Xavier Ducrohet
c79d71b4cb am 9649059f: Prepare rev 2 of platform pkg for jb. do not merge.
* commit '9649059fa0d764845d8e4ebeef17d54a6aaf8a41':
  Prepare rev 2 of platform pkg for jb. do not merge.
2012-07-10 11:51:25 -07:00
Xavier Ducrohet
9649059fa0 Prepare rev 2 of platform pkg for jb. do not merge.
Change-Id: I7358b0d482df19668e75f20240fd3795870724d8
2012-07-09 18:43:31 -07:00
Scott Main
43eb9a78c3 am 3e926e05: Merge "Update doc package to r2. do not merge." into jb-dev
* commit '3e926e05d35c62b8e51defcdae8f099ebe92d3ed':
  Update doc package to r2. do not merge.
2012-07-03 14:22:39 -07:00
Scott Main
3e926e05d3 Merge "Update doc package to r2. do not merge." into jb-dev 2012-07-03 14:19:41 -07:00
Xavier Ducrohet
3c41c70f0d Update doc package to r2. do not merge.
Change-Id: Ifb87031e2b26b68e8d8c6329d5a33de04ef6681f
2012-07-03 14:18:52 -07:00
The Android Open Source Project
d0ba66decf Reconcile with jb-release
Change-Id: I937a350902e0c3aa128d9f33f67994099da8a634
2012-07-03 13:30:54 -07:00
Anirudh Dewani
766b7f578d am 5ef1389e: packaging the sample for SDK
* commit '5ef1389ebb89c25836c0cc7a1dfc1ef8ad3209a3':
  packaging the sample for SDK
2012-07-03 13:13:57 -07:00
The Android Automerger
d29d91e89b merge in jb-release history after reset to jb-dev 2012-07-03 12:51:31 -07:00
Anirudh Dewani
5ef1389ebb packaging the sample for SDK
Change-Id: Ie398d7dfd421d7ec3de7ce58a9b9dedd532cd2db
2012-07-03 12:48:49 -07:00
Anirudh Dewani
8ab50ab5a6 am 89c08bb5: Merge "WiFi Direct Service Discovery sample" into jb-dev
* commit '89c08bb50f6dbb57fb0ad7881f1b0556c38a2b5f':
  WiFi Direct Service Discovery sample
2012-07-03 12:32:24 -07:00