LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,251 Commits 2 Branches 0 Tags
2625a13203bd702f369dd2bc3ec7ba101cd6ad89
Commit Graph

10251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
The Android Automerger
95e0d504bc merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-08 06:33:34 -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
The Android Automerger
c8123801f6 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-07 06:33:44 -07:00
Elliott Hughes
60fa2c3888 am ede21119: am fdb7308b: Merge "Use uintptr_t for cast pointer to integer." 
* commit 'ede21119df2a9bfed7125380fbe7af32c7aa13e3':
  Use uintptr_t for cast pointer to integer.
 2012-08-06 13:23:27 -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
The Android Automerger
1fa2dfd59a merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-06 06:27:41 -07:00
Xavier Ducrohet
e5fcbb1ba9 am e76ba310: am 78f6f9b1: Merge "Add Mips support to SDK." 
* commit 'e76ba31077b42e4e2de1aa4af47db6bf9213cba6':
  Add Mips support to SDK.
 2012-08-02 17:24:40 -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 Automerger
7a3c074423 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-02 07:14:26 -07:00
Nick Pelly
c1ca7cfbdc Merge "Update eclipse .classpath" into jb-mr1-dev 2012-08-01 16:13:21 -07:00
Nick Pelly
0956cd2055 Update eclipse .classpath 
Change-Id: I0b9120c72c2e59544339280606307a9ebd15db51
 2012-08-01 16:11:27 -07:00
The Android Open Source Project
d397be39eb am 215695fe: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '215695fe5e84f1fd7acecf1bec68c6dd69ea3247':
 2012-07-31 14:49:16 -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
The Android Automerger
73941e1f8e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-07-31 07:35:16 -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
0ed29970de am 1fc6c8dd: am a3ba2ea7: Merge "docs: quotes in comments apparently crash the server" into jb-dev 
* commit '1fc6c8dd48e875d39c0bf8b7013437db389051e6':
  docs: quotes in comments apparently crash the server
 2012-07-30 14:17:37 -07: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
9f749ed1ff am 84c68cad: am f3c5b01d: Reconcile with jb-mr0-release jb-release 
* commit '84c68cad1e4b698f08fd7c09a4bf0bb4d058dce0':
 2012-07-27 16:23:46 -07:00
The Android Open Source Project
84c68cad1e am f3c5b01d: Reconcile with jb-mr0-release jb-release 
* commit 'f3c5b01d6d1a1a3ca1b2df4032849948a60bcbc4':
 2012-07-27 15:45:27 -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
2bd449b0d5 am 1a14e240: am 1aeb3525: 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 '1a14e2406708a7404e671f7d6751842c3b654fe9':
  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:46:24 -07:00