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
47054ae9f4
am 80315310: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '80315310312a1e4927105049e6678c47d554b745':
2012-08-16 19:12:57 -07:00
The Android Open Source Project
8031531031
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I96f8b96f0cc4157c6a093f76bf90e648b982da48
2012-08-16 19:09:56 -07:00
The Android Open Source Project
582bf5d51f
am 0ec1ebcd: (-s ours) am 8bb46bec: am a4a9820f: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit '0ec1ebcd823bbd86a9d0a715b7ec0b5526170113':
2012-08-16 19:02:58 -07:00
The Android Open Source Project
0ec1ebcd82
am 8bb46bec: am a4a9820f: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit '8bb46bec8b798c9fb3ac5e906ec8c3b1fbccc853':
2012-08-16 19:01:47 -07:00
The Android Open Source Project
8bb46bec8b
am a4a9820f: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit 'a4a9820f373792a760356ae19117f29ef7145352':
2012-08-16 18:59:00 -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
Chao-Ying Fu
0bcbd32a9a
Support all portable requests.
...
Change-Id: I1032362a48456a961f258e624df313e7841b3d81
2012-08-16 17:52:19 -07:00
Andrew Hsieh
b31b79830b
Retire LOCAL_NDK_VERSION (DO NOT MERGE)
...
Change-Id: If37bcae0c5833f195e954a8bfbda6b8686b3705e
2012-08-17 07:17:31 +08:00
Dianne Hackborn
758a8ccd5c
am 846fe415: am 77201b54: Rename UserId to UserHandle.
...
* commit '846fe415350bd0668f8a2190d1c78cf07c97ef60':
Rename UserId to UserHandle.
2012-08-16 12:53:44 -07:00
Dianne Hackborn
846fe41535
am 77201b54: Rename UserId to UserHandle.
...
* commit '77201b54149ff8d531eb15ac5bd8386b325974be':
Rename UserId to UserHandle.
2012-08-16 12:51:37 -07:00
Dianne Hackborn
77201b5414
Rename UserId to UserHandle.
...
Change-Id: I701335483628d30c875d087f27287e084789f10c
2012-08-16 12:46:49 -07:00
The Android Automerger
57a0c93cc9
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-16 06:33:23 -07:00
Andrew Hsieh
1643406d85
am cc3a8619: am c225f65c: am b4f55d49: am 110870d5: Merge "Add portable support for errno.h."
...
* commit 'cc3a86193aa55e9e341cd014aab7bca243f03089':
Add portable support for errno.h.
2012-08-16 02:21:45 -07:00
Andrew Hsieh
cc3a86193a
am c225f65c: am b4f55d49: am 110870d5: Merge "Add portable support for errno.h."
...
* commit 'c225f65c5d26cae7e3da55be1c25da6c76c658eb':
Add portable support for errno.h.
2012-08-16 02:20:23 -07:00
Andrew Hsieh
c225f65c5d
am b4f55d49: am 110870d5: Merge "Add portable support for errno.h."
...
* commit 'b4f55d49f90d7414f27a0139a2d91ffc39aacee4':
Add portable support for errno.h.
2012-08-16 02:18:10 -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
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