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
Jeff Brown
cb54296cae
am b25ebf3f: am 9bb23fd7: Use new PowerManager API.
...
* commit 'b25ebf3fc78c98b508f1b51278d017c070998ea8':
Use new PowerManager API.
2012-08-15 10:30:45 -07:00
Jeff Brown
b25ebf3fc7
am 9bb23fd7: Use new PowerManager API.
...
* commit '9bb23fd7f9081c28b39dd21f7023676b5c940058':
Use new PowerManager API.
2012-08-15 10:28:04 -07:00
The Android Open Source Project
d41f9bc7a1
am 979d2953: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '979d29539489e150fe83b284a8a0b9b3e0a9da23':
2012-08-15 08:27:31 -07:00
The Android Open Source Project
979d295394
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I71b4ea5ad6e24404a14213b18915ef2907e34b4d
2012-08-15 08:26:32 -07:00
The Android Automerger
3545476678
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-15 06:33:35 -07:00
Jeff Brown
9bb23fd7f9
Use new PowerManager API.
...
Change-Id: I2901fd02cd5b2307e3a4d2f35b03ef7060712908
2012-08-14 17:43:33 -07:00
Andrew Hsieh
1a81d36f52
am e43d646b: am c22d5210: am e26aeb9a: am 268cffa4: Merge "MIPS doesn\'t have __st_ino, so store 0 for this field in p_stat structure"
...
* commit 'e43d646bf38b3f50fd8f4b13b1fa72cea74a9543':
MIPS doesn't have __st_ino, so store 0 for this field in p_stat structure
2012-08-14 17:24:05 -07:00
Andrew Hsieh
e43d646bf3
am c22d5210: am e26aeb9a: am 268cffa4: Merge "MIPS doesn\'t have __st_ino, so store 0 for this field in p_stat structure"
...
* commit 'c22d5210c507895d9b7893fa6d0a2fbff2a23ef1':
MIPS doesn't have __st_ino, so store 0 for this field in p_stat structure
2012-08-14 17:22:00 -07:00
Andrew Hsieh
c22d5210c5
am e26aeb9a: am 268cffa4: Merge "MIPS doesn\'t have __st_ino, so store 0 for this field in p_stat structure"
...
* commit 'e26aeb9aac4e9cfbac822faea581addac66be4ec':
MIPS doesn't have __st_ino, so store 0 for this field in p_stat structure
2012-08-14 17:20:37 -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
b263ee8a76
am 2672d6c5: am 8e9ba4ef: am 6024d7d6: am 020d4ab4: Establish the dependency on the uiautomator stubs.
...
* commit '2672d6c5a5a8c67a973ad288704abc3ab5c28fd5':
Establish the dependency on the uiautomator stubs.
2012-08-14 16:52:12 -07:00
Ying Wang
2672d6c5a5
am 8e9ba4ef: am 6024d7d6: am 020d4ab4: Establish the dependency on the uiautomator stubs.
...
* commit '8e9ba4efbea59752d9bcbb1ac4d2a95771d0f2f3':
Establish the dependency on the uiautomator stubs.
2012-08-14 16:50:06 -07:00
Ying Wang
8e9ba4efbe
am 6024d7d6: am 020d4ab4: Establish the dependency on the uiautomator stubs.
...
* commit '6024d7d616f43039a50f895d1a3c6468acff89ec':
Establish the dependency on the uiautomator stubs.
2012-08-14 16:48:41 -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
Chiao Cheng
d9553be5d1
Merge "Adding new script to generate Intellij projects."
2012-08-14 14:09:11 -07:00
Scott Main
42b8e687ec
am fcc99c73: am 4c142d7c: am 84b24a6a: 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 allo
...
* commit 'fcc99c73a8b77d64f5424071205f0ceab42ab809':
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:13:28 -07:00
Scott Main
fcc99c73a8
am 4c142d7c: am 84b24a6a: 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
...
* commit '4c142d7c9b8baf2c83dd73ba0e19ab5e3f1b4c60':
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:12:01 -07:00
Scott Main
4c142d7c9b
am 84b24a6a: 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 l
...
* commit '84b24a6a12bcc9224e60a964828ae752e84073b4':
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:10:22 -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
9ff82b19cd
am 95388b80: am 37fbcff0: am 1e3b3b0a: am 611c676b: Add uiautomator.jar to SDK package.
...
* commit '95388b80a8340e75da92f8280b1ca13ab4f1a609':
Add uiautomator.jar to SDK package.
2012-08-14 12:50:36 -07:00
Xavier Ducrohet
95388b80a8
am 37fbcff0: am 1e3b3b0a: am 611c676b: Add uiautomator.jar to SDK package.
...
* commit '37fbcff0cb42962c193105c4e24942c3653a4c64':
Add uiautomator.jar to SDK package.
2012-08-14 12:49:25 -07:00
Xavier Ducrohet
37fbcff0cb
am 1e3b3b0a: am 611c676b: Add uiautomator.jar to SDK package.
...
* commit '1e3b3b0a9c90af521e2adaf91e7c548009461958':
Add uiautomator.jar to SDK package.
2012-08-14 12:47:25 -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
Ying Wang
5c5d3a10ac
am f801e6a0: am 9a1ad355: Retire LOCAL_NDK_VERSION.
...
* commit 'f801e6a07888df9b968d4f000d7319a471c8f79c':
Retire LOCAL_NDK_VERSION.
2012-08-14 12:21:01 -07:00
Ying Wang
f801e6a078
am 9a1ad355: Retire LOCAL_NDK_VERSION.
...
* commit '9a1ad355d9cf721b14e82b2ea6fba1f88705d4eb':
Retire LOCAL_NDK_VERSION.
2012-08-14 12:13:16 -07:00
Xavier Ducrohet
611c676b7b
Add uiautomator.jar to SDK package.
...
Bug: 6876802
Change-Id: Id2c378ffe458d5a177535c39ca909c498228f6ec
2012-08-14 12:01:19 -07:00
Ying Wang
9a1ad355d9
Retire LOCAL_NDK_VERSION.
...
Bug: 6932421
Change-Id: Iee6285681aa85f57cf70fd4846bd2e01ef1b67c9
2012-08-14 11:59:50 -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
1da8adca7a
am bc189514: am b2e46f57: am f6b7171e: am 270a609e: Merge "Add telephony intermediates to classpath"
...
* commit 'bc1895144dc281757b97e9349afa87a5525fc36a':
Add telephony intermediates to classpath
2012-08-14 11:11:54 -07:00
Jean-Baptiste Queru
b8d42e8233
am 1f490fd1: am 8f3ad008: am d6d00263: am ad2124c7: Merge "Add opt/telephony and opt/mms to eclipse .classpath"
...
* commit '1f490fd16cd31cc0e3d2642eeeda7dfd389263c3':
Add opt/telephony and opt/mms to eclipse .classpath
2012-08-14 11:11:53 -07:00
Jean-Baptiste Queru
bc1895144d
am b2e46f57: am f6b7171e: am 270a609e: Merge "Add telephony intermediates to classpath"
...
* commit 'b2e46f57f8536188539e1588816da3392f5be719':
Add telephony intermediates to classpath
2012-08-14 11:10:40 -07:00
Jean-Baptiste Queru
1f490fd16c
am 8f3ad008: am d6d00263: am ad2124c7: Merge "Add opt/telephony and opt/mms to eclipse .classpath"
...
* commit '8f3ad008876ab7263606bda6c441ed5bc8e940a6':
Add opt/telephony and opt/mms to eclipse .classpath
2012-08-14 11:10:39 -07:00
Jean-Baptiste Queru
b2e46f57f8
am f6b7171e: am 270a609e: Merge "Add telephony intermediates to classpath"
...
* commit 'f6b7171edf6f89264ea58af0e9b21fdb419d6feb':
Add telephony intermediates to classpath
2012-08-14 11:08:15 -07:00
Jean-Baptiste Queru
8f3ad00887
am d6d00263: am ad2124c7: Merge "Add opt/telephony and opt/mms to eclipse .classpath"
...
* commit 'd6d002632764f84fd38f351fb279f11fcf7e1939':
Add opt/telephony and opt/mms to eclipse .classpath
2012-08-14 11:08:14 -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
Ying Wang
fa8f42a2bf
Retire LOCAL_NDK_VERSION.
...
Bug: 6932421
Change-Id: Iee6285681aa85f57cf70fd4846bd2e01ef1b67c9
2012-08-14 10:19:09 -07:00
The Android Automerger
2625a13203
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-14 07:06:21 -07:00
Andrew Hsieh
d7291ce292
am d29dc267: am c1b21dfc: am 82a5b49e: am 426bd666: Merge "Move libportable from ndk.git to development.git."
...
* commit 'd29dc2671a5bf3596b6b4609565531911fde13b5':
Move libportable from ndk.git to development.git.
2012-08-14 02:14:02 -07:00
Andrew Hsieh
d29dc2671a
am c1b21dfc: am 82a5b49e: am 426bd666: Merge "Move libportable from ndk.git to development.git."
...
* commit 'c1b21dfc6ab1a06e5de6c513ad059020bb2b61ce':
Move libportable from ndk.git to development.git.
2012-08-14 02:12:00 -07:00
Andrew Hsieh
c1b21dfc6a
am 82a5b49e: am 426bd666: Merge "Move libportable from ndk.git to development.git."
...
* commit '82a5b49e9e9183e052e2eb28e48c4e39c63b2dc8':
Move libportable from ndk.git to development.git.
2012-08-14 02:10:38 -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