Andrew Hsieh
598f966a4b
am 2177f88f: Merge "Support all MAP flags and update mmap_portable."
...
* commit '2177f88f011e2fcdaaba34ba810859b30cfd2593':
Support all MAP flags and update mmap_portable.
2012-08-16 20:10:06 -07:00
Andrew Hsieh
2177f88f01
Merge "Support all MAP flags and update mmap_portable."
2012-08-16 19:45:47 -07:00
The Android Open Source Project
a4a9820f37
Reconcile with jb-mr0-release - do not merge
...
Change-Id: Ia08d24491caba9dc02d8e09af5fd00e33daab33c
2012-08-16 18:56:09 -07:00
Chao-Ying Fu
25899fcec1
Support all MAP flags and update mmap_portable.
...
Change-Id: I17600e70028d35dc2f2da05ed4a1b3d7ad051a63
2012-08-16 18:46:17 -07:00
The Android Automerger
50e9d77860
merge in jb-mr0-release history after reset to jb-dev
2012-08-16 17:57:23 -07:00
Andrew Hsieh
b4f55d49f9
am 110870d5: Merge "Add portable support for errno.h."
...
* commit '110870d5d0e483ac2ca257490db6b89e19438140':
Add portable support for errno.h.
2012-08-16 02:15:27 -07:00
Andrew Hsieh
110870d5d0
Merge "Add portable support for errno.h."
2012-08-16 01:59:46 -07:00
Chao-Ying Fu
3e1d447f43
Add portable support for errno.h.
...
Change-Id: Ia232caff586a1296b4330f450e4cfe4fec51198b
2012-08-15 11:58:43 -07:00
Andrew Hsieh
e26aeb9aac
am 268cffa4: Merge "MIPS doesn\'t have __st_ino, so store 0 for this field in p_stat structure"
...
* commit '268cffa41b95c9f0484ebb743a0c2359087ed03b':
MIPS doesn't have __st_ino, so store 0 for this field in p_stat structure
2012-08-14 17:18:54 -07:00
Andrew Hsieh
268cffa41b
Merge "MIPS doesn't have __st_ino, so store 0 for this field in p_stat structure"
2012-08-14 17:10:01 -07:00
Ying Wang
6024d7d616
am 020d4ab4: Establish the dependency on the uiautomator stubs.
...
* commit '020d4ab4fa296d4e3a6d1f16aed97738bbc55f43':
Establish the dependency on the uiautomator stubs.
2012-08-14 16:46:51 -07:00
Ying Wang
020d4ab4fa
Establish the dependency on the uiautomator stubs.
...
Bug: 6876802
Change-Id: I27dae218b798f4e939d37ee32238e7d489623a40
2012-08-14 16:38:02 -07:00
Scott Main
84b24a6a12
am ed7df702: Merge "docs: New redirect rule for all /downloads/... paths, pointing to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to use a simple URL in our docs for downloads and allows us change the storage location of th
...
* commit 'ed7df702bdff3f60c685e1d64c80f712585193f6':
docs: New redirect rule for all /downloads/... paths, pointing to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to use a simple URL in our docs for downloads and allows us change the storage location of the download assets in the future (such as when we're on devsite).
2012-08-14 13:09:09 -07:00
Scott Main
ed7df702bd
Merge "docs: New redirect rule for all /downloads/... paths, pointing to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to use a simple URL in our docs for downloads and allows us change the storage location of the download assets in the future (such as when we're on devsite)." into jb-dev
2012-08-14 13:03:53 -07:00
Xavier Ducrohet
1e3b3b0a9c
am 611c676b: Add uiautomator.jar to SDK package.
...
* commit '611c676b7b7bd983a63f0292661c79c4ccb23bc3':
Add uiautomator.jar to SDK package.
2012-08-14 12:45:26 -07:00
Xavier Ducrohet
611c676b7b
Add uiautomator.jar to SDK package.
...
Bug: 6876802
Change-Id: Id2c378ffe458d5a177535c39ca909c498228f6ec
2012-08-14 12:01:19 -07:00
Scott Main
1815b80ee8
docs: New redirect rule for all /downloads/... paths, pointing to http://commondatastorage.googleapis.com/androiddevelopers/
...
Using this redirect allows us to use a simple URL in our docs for downloads and
allows us change the storage location of the download assets in the future (such as when we're on devsite).
Change-Id: Ic8244fbdd4118607b31dd309b86e5df2ec83162b
2012-08-14 11:50:32 -07:00
Chao-ying Fu
639c9f49ce
MIPS doesn't have __st_ino, so store 0 for this field in p_stat structure
...
Change-Id: Ia9ed9e5b90291e199b0b351eba65d22a6966a1c9
2012-08-14 11:14:08 -07:00
Jean-Baptiste Queru
f6b7171edf
am 270a609e: Merge "Add telephony intermediates to classpath"
...
* commit '270a609e4088978f83191d29311e83e496e34b5b':
Add telephony intermediates to classpath
2012-08-14 11:06:51 -07:00
Jean-Baptiste Queru
d6d0026327
am ad2124c7: Merge "Add opt/telephony and opt/mms to eclipse .classpath"
...
* commit 'ad2124c71dc1e5b1370a010700ecb41c06ea084e':
Add opt/telephony and opt/mms to eclipse .classpath
2012-08-14 11:06:49 -07:00
Jean-Baptiste Queru
270a609e40
Merge "Add telephony intermediates to classpath"
2012-08-14 10:46:53 -07:00
Jean-Baptiste Queru
ad2124c71d
Merge "Add opt/telephony and opt/mms to eclipse .classpath"
2012-08-14 10:46:48 -07:00
Andrew Hsieh
82a5b49e9e
am 426bd666: Merge "Move libportable from ndk.git to development.git."
...
* commit '426bd66696207c54a7a93017cc296edf99264cfc':
Move libportable from ndk.git to development.git.
2012-08-14 02:08:32 -07:00
Andrew Hsieh
426bd66696
Merge "Move libportable from ndk.git to development.git."
2012-08-14 01:50:11 -07:00
Shih-wei Liao
bf1b1e6c7f
Move libportable from ndk.git to development.git.
...
libportable should be in development.git instead of ndk.git.
Change-Id: Ic369ca6a0e4ffbd2741777c8d9ec578e8ce5abbd
2012-08-14 01:43:15 -07:00
Kenny Root
e2ba6f72dc
am ecab0379: Merge "Remove useless TestRunner for KeyStoreTests"
...
* commit 'ecab03799b34108924b88183d9bde14329691fbb':
Remove useless TestRunner for KeyStoreTests
2012-08-13 09:15:32 -07:00
Kenny Root
ecab03799b
Merge "Remove useless TestRunner for KeyStoreTests"
2012-08-13 09:01:55 -07:00
Kenny Root
4e0e948e3b
Remove useless TestRunner for KeyStoreTests
...
InstrumentationTestRunner can enumerate the test cases to run without a
special TestRunner in KeyStoreTests.
Change-Id: I9e849d035d78b51ca9a73c52012dab448fc4a7ee
2012-08-10 13:41:20 -07:00
The Android Open Source Project
f6de0952d1
Reconcile with jb-mr0-release - do not merge
...
Change-Id: I4cf69544b3cddd8558400e57aa20edca8d0b535b
2012-08-10 08:33:58 -07:00
The Android Automerger
0ead859f71
merge in jb-mr0-release history after reset to jb-dev
2012-08-09 11:36:40 -07:00
Andy Stadler
bacdb6afd2
Add telephony intermediates to classpath
...
Change-Id: I019e3f2d4d3eb570590a8d1758b82cc1c1669c19
2012-08-09 08:16:26 -07:00
Wink Saville
eae8078ded
Add opt/telephony and opt/mms to eclipse .classpath
...
Change-Id: I7ac5ff06f72435dbe10463ca71413df1fde9e676
2012-08-09 08:16:19 -07:00
Scott Main
5e01d367b0
am ef91cce8: Merge "remove all zip files for training class samples. They\'re now at frameworks/base/docs/downloads/" into jb-dev
...
* commit 'ef91cce81b6b89c5d47c6fbda9ea913a95fa7d46':
remove all zip files for training class samples. They're now at frameworks/base/docs/downloads/
2012-08-07 15:23:33 -07:00
Scott Main
ef91cce81b
Merge "remove all zip files for training class samples. They're now at frameworks/base/docs/downloads/" into jb-dev
2012-08-07 15:21:00 -07:00
Scott Main
826be7b0f9
remove all zip files for training class samples.
...
They're now at frameworks/base/docs/downloads/
Change-Id: I3a82edcc73196dfc8ffc6a1e4d172925d5581157
2012-08-07 15:13:23 -07:00
Elliott Hughes
ede21119df
am fdb7308b: Merge "Use uintptr_t for cast pointer to integer."
...
* commit 'fdb7308bb75e503486be134103d1260aadec8cae':
Use uintptr_t for cast pointer to integer.
2012-08-06 13:22:05 -07:00
Elliott Hughes
fdb7308bb7
Merge "Use uintptr_t for cast pointer to integer."
2012-08-06 13:15:16 -07:00
Xavier Ducrohet
e76ba31077
am 78f6f9b1: Merge "Add Mips support to SDK."
...
* commit '78f6f9b1f34e543e0806cfb0393e29b1e39ae84f':
Add Mips support to SDK.
2012-08-02 17:22:57 -07:00
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