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
9bb23fd7f9
Use new PowerManager API.
...
Change-Id: I2901fd02cd5b2307e3a4d2f35b03ef7060712908
2012-08-14 17:43:33 -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
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
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
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
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
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
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
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
Mathias Agopian
fa0cfa7bb6
Merge "update eclipse C++ include paths" into jb-mr1-dev
2012-08-13 14:19:19 -07:00
Mathias Agopian
4e2b37c89a
update eclipse C++ include paths
...
Change-Id: Ie86250be5513e6ccc2780425d02a6c83397fd8e9
2012-08-13 14:18:17 -07:00
Eino-Ville Talvala
42467d908f
Merge "EmulatedFakeCamera2: Add face detection support." into jb-mr1-dev
2012-08-13 10:13:47 -07:00
Eino-Ville Talvala
ae031a1aea
EmulatedFakeCamera2: Add face detection support.
...
Bug: 6243944c
Change-Id: Ice45571b44af2975cc699e4e8b95fb170a889117
2012-08-13 09:40:14 -07:00
Kenny Root
ff61da9b3a
am e2ba6f72: am ecab0379: Merge "Remove useless TestRunner for KeyStoreTests"
...
* commit 'e2ba6f72dc7f4ffa6323dfd5338de29bbd8fa35f':
Remove useless TestRunner for KeyStoreTests
2012-08-13 09:26:02 -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
Nick Pelly
cd0827adb7
Update config.xml overlay for new key config_overlay_locationProviderPackageNames
...
Change-Id: I6119516077d018f6c149fa006fb011cfe809f688
2012-08-10 18:08:35 -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
Eino-Ville Talvala
819d2aac43
Merge "EmulatedFakeCamera2: Add autofocus management" into jb-mr1-dev
2012-08-10 12:38:05 -07:00
The Android Open Source Project
81a034f147
am f6de0952: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit 'f6de0952d12995ae8808f46d0e4fa1f6974c1d61':
2012-08-10 12:36:41 -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
Eino-Ville Talvala
f856a82b87
EmulatedFakeCamera2: Add autofocus management
...
- Add skeleton ControlThread for 3A processing
- Add fake autofocus management into ControlThread
- Support AUTO, MACRO, CONTINUOUS_PICTURE, CONTINUOUS_VIDEO
Bug: 6243944
Change-Id: Ic47f5be642d4705db86021b94aaba8dcc7f32cf0
2012-08-08 10:43:37 -07:00
Scott Main
fbd1a85d7b
am 5e01d367: am ef91cce8: Merge "remove all zip files for training class samples. They\'re now at frameworks/base/docs/downloads/" into jb-dev
...
* commit '5e01d367b08ea225af6bca294acd04706ecaede2':
remove all zip files for training class samples. They're now at frameworks/base/docs/downloads/
2012-08-07 15:24:59 -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