Commit Graph

10347 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
0d82e3e741 am fa0cfa7b: Merge "update eclipse C++ include paths" into jb-mr1-dev
* commit 'fa0cfa7bb621aae5028df6454aed877a6e4eba7f':
  update eclipse C++ include paths
2012-08-13 14:21:06 -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
1f999cd6c9 am 42467d90: Merge "EmulatedFakeCamera2: Add face detection support." into jb-mr1-dev
* commit '42467d908f86a60b695409ecda4067ee74a5162c':
  EmulatedFakeCamera2: Add face detection support.
2012-08-13 10:14:58 -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
183700a0d6 am ff61da9b: am e2ba6f72: am ecab0379: Merge "Remove useless TestRunner for KeyStoreTests"
* commit 'ff61da9b3afbcd4df7e40d97c5537ff3afa592c8':
  Remove useless TestRunner for KeyStoreTests
2012-08-13 09:27:53 -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
The Android Automerger
6df5c0c462 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-13 08:09:10 -07:00
Nick Pelly
0827df3a62 am cd0827ad: Update config.xml overlay for new key config_overlay_locationProviderPackageNames
* commit 'cd0827adb794bf6669a63e98ad31402075af1a39':
  Update config.xml overlay for new key config_overlay_locationProviderPackageNames
2012-08-10 18:11:25 -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
d5bc34888d am 819d2aac: Merge "EmulatedFakeCamera2: Add autofocus management" into jb-mr1-dev
* commit '819d2aac43d27100df59ee009c211169787b55dd':
  EmulatedFakeCamera2: Add autofocus management
2012-08-10 12:40:24 -07:00
The Android Open Source Project
67ab9e6fe0 am 81a034f1: am f6de0952: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '81a034f14743a08ccf9e796880249f2d495f4c05':
2012-08-10 12:40:22 -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