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

10063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
eaeca43a2e am a7db9092: am 8189fcfa: merge redirects file from ics and add redirects for tutorials 
* commit 'a7db90927591ff03f3bf21dd945a356361371c69':
  merge redirects file from ics and add redirects for tutorials
 2012-06-21 23:24:55 -07:00
Scott Main
a7db909275 am 8189fcfa: merge redirects file from ics and add redirects for tutorials 
* commit '8189fcfacbb3c5959ea74e346ee93c20c8e02dcd':
  merge redirects file from ics and add redirects for tutorials
 2012-06-21 23:21:40 -07:00
Scott Main
8189fcfacb merge redirects file from ics and add redirects for tutorials 
Change-Id: I28b64f6e48d6363a3c89a4e34f87db458d29e2b8
 2012-06-21 23:15:53 -07:00
Xavier Ducrohet
c5fd927f4a am 8f38da3d: am e8f7f5fe: Fix WXGA800-7in to be portrait by default. 
* commit '8f38da3deff60c9d5cac0b355c2d95d967216828':
  Fix WXGA800-7in to be portrait by default.
 2012-06-21 19:41:14 -07:00
Xavier Ducrohet
8f38da3def am e8f7f5fe: Fix WXGA800-7in to be portrait by default. 
* commit 'e8f7f5fe9f08c2381908d13a63fc34b12d6f95c3':
  Fix WXGA800-7in to be portrait by default.
 2012-06-21 19:39:13 -07:00
Xavier Ducrohet
e8f7f5fe9f Fix WXGA800-7in to be portrait by default. 
Bug: 6712001

Change-Id: I047e023e726f83ff63f8fe00fb3f43698ad1db37
 2012-06-21 19:33:26 -07:00
Xavier Ducrohet
4700bc72de am 52c627a5: am 5ff9fd62: Merge "Update the API 16 files used by the SDK." into jb-dev 
* commit '52c627a543113a0279237f691ac26608b67cd66d':
  Update the API 16 files used by the SDK.
 2012-06-21 18:24:18 -07:00
Xavier Ducrohet
52c627a543 am 5ff9fd62: Merge "Update the API 16 files used by the SDK." into jb-dev 
* commit '5ff9fd62fb0eca575c55c3dd3d0484396f42d4e3':
  Update the API 16 files used by the SDK.
 2012-06-21 18:22:39 -07:00
Xavier Ducrohet
5ff9fd62fb Merge "Update the API 16 files used by the SDK." into jb-dev 2012-06-21 18:20:41 -07:00
Xavier Ducrohet
1e493205ac Update the API 16 files used by the SDK. 
Change-Id: I0ee375c93522cff1add504fc19081e25c131627e
 2012-06-21 17:48:38 -07:00
Martijn Coenen
a0e3ce5db6 am 56f8408e: (-s ours) am 0c3d438a: Fix NPE in BeamDemo if NFC not present. do not merge. 
* commit '56f8408e43d0ac9e36aab6a34fbdf90398aa4377':
  Fix NPE in BeamDemo if NFC not present. do not merge.
 2012-06-21 17:22:57 -07:00
Martijn Coenen
56f8408e43 am 0c3d438a: Fix NPE in BeamDemo if NFC not present. do not merge. 
* commit '0c3d438a930d905e23ba2148ffccdbdc03851189':
  Fix NPE in BeamDemo if NFC not present. do not merge.
 2012-06-21 17:20:59 -07:00
Martijn Coenen
0c3d438a93 Fix NPE in BeamDemo if NFC not present. do not merge. 
Bug: 6711303

(cherry picked from commit 76aca97d26)

Change-Id: I626d060bf2951c213679685dc57ee2eda7398da2
 2012-06-21 17:18:26 -07:00
Martijn Coenen
cc59ae597c Merge "Fix NPE in BeamDemo if NFC not present." 2012-06-21 16:02:57 -07:00
Martijn Coenen
76aca97d26 Fix NPE in BeamDemo if NFC not present. 
Bug: 6711303
Change-Id: Iad6abab3ea2ca53247ed4e3b5149e052bd92453b
 2012-06-21 15:26:47 -07:00
Keun young Park
540e276c72 Merge "remove development/data/etc/*" 2012-06-20 09:47:31 -07:00
The Android Open Source Project
555e713d03 am 976643f7: Reconcile with jb-release 
* commit '976643f72db71a82b6d27d356bb30e4e1cd64504':
 2012-06-20 08:28:18 -07:00
The Android Open Source Project
976643f72d Reconcile with jb-release 
Change-Id: I43a365794949df0e50d3afd06642d67c33dd2e09
 2012-06-20 08:25:35 -07:00
The Android Automerger
41e8cdbdbb merge in jb-release history after reset to jb-dev 2012-06-20 07:00:13 -07:00
Keun young Park
3aa86bfd7b remove development/data/etc/* 
- migrated to device/generic/goldfish/data/etc

Change-Id: If8dd71c6e6db5a79ec56efbba2fc28e592971ee4
 2012-06-19 18:27:27 -07:00
Xavier Ducrohet
16a94a4be4 am 2418f22b: am ddb532df: Support lib is now in rev 9 
* commit '2418f22bf19b16427c44f9240b0e1f2c857e0610':
  Support lib is now in rev 9
 2012-06-19 18:05:16 -07:00
Xavier Ducrohet
2418f22bf1 am ddb532df: Support lib is now in rev 9 
* commit 'ddb532df5831dd8067842b4ffaee241a2f9b2ce6':
  Support lib is now in rev 9
 2012-06-19 18:02:44 -07:00
Xavier Ducrohet
ddb532df58 Support lib is now in rev 9 
Change-Id: Ie88b3dcd91a1e244f7599240d43c5bb7f7833ce2
 2012-06-19 18:00:34 -07:00
Xavier Ducrohet
8d7fa1d1ac am e4ac28db: am ffd4e751: Merge "Add Platform.CodeName to source.properties" into jb-dev 
* commit 'e4ac28dbd4ab7fdd2671f3894f63804af074f98e':
  Add Platform.CodeName to source.properties
 2012-06-19 16:34:34 -07:00
Xavier Ducrohet
e4ac28dbd4 am ffd4e751: Merge "Add Platform.CodeName to source.properties" into jb-dev 
* commit 'ffd4e751ac3f736b5fb5d9fbfeebb07c6c7d04c2':
  Add Platform.CodeName to source.properties
 2012-06-19 16:32:15 -07:00
Xavier Ducrohet
ffd4e751ac Merge "Add Platform.CodeName to source.properties" into jb-dev 2012-06-19 16:30:05 -07:00
Xavier Ducrohet
f5d811e71f Add Platform.CodeName to source.properties 
This does not use the placeholder because it doesn't seem
to work when the platform loses its codename.

Change-Id: I98a828915fe23f2fb777e329289303f17b05a60e
 2012-06-19 16:28:25 -07:00
Alexander Lucas
3082564e7d am d281a34e: am 8a8046a9: Initial commit of NsdChat application 
* commit 'd281a34e15d6687d747812cca513d5ee98624866':
  Initial commit of NsdChat application
 2012-06-19 11:38:41 -07:00
Alexander Lucas
d281a34e15 am 8a8046a9: Initial commit of NsdChat application 
* commit '8a8046a91865f972d38809d6f0a8c2f4d56fb17e':
  Initial commit of NsdChat application
 2012-06-19 11:36:23 -07:00
The Android Open Source Project
726ab60ed5 am 259ede59: Reconcile with jb-release 
* commit '259ede59a01e5504dbdaf176fff03566fda0c6f8':
 2012-06-19 06:15:56 -07:00
The Android Open Source Project
259ede59a0 Reconcile with jb-release 
Change-Id: Ic5e32d1db3a8d3c4a7d5ad4231457b9e38445f20
 2012-06-19 06:13:12 -07:00
Alexander Lucas
8a8046a918 Initial commit of NsdChat application 
Change-Id: I157ddfe38b79f01e72e8b52fa16d666c92f08254
 2012-06-18 16:25:19 -07:00
Eino-Ville Talvala
9f3517e96f EmulatedFakeCamera2: Use correct camera orientation. 
Get orientation from the camera factory; otherwise preview is
displayed incorrectly.

Bug: 6243944
Change-Id: Icb27a53ad333109a62dce012216aca67e3e881b8
 2012-06-15 13:15:55 -07:00
Eino-Ville Talvala
c4ae6ea167 Merge "EmulatedFakeCamera2: Implement basic dump()" 2012-06-14 11:19:24 -07:00
Eino-Ville Talvala
cc588adda3 EmulatedFakeCamera2: Implement basic dump() 
Bug: 6243944
Change-Id: I84696ea79f8c36d34c2cccdac259c9baba048c1f
 2012-06-14 10:52:04 -07:00
The Android Automerger
7704524573 merge in jb-release history after reset to jb-dev 2012-06-14 07:00:08 -07:00
Eino-Ville Talvala
f6c061fdfc Merge "EmulatedFakeCamera2: Add support for JPEG output, multiple streams" 2012-06-13 17:25:19 -07:00
Eino-Ville Talvala
4cb80a83bc Merge "Emulator gralloc: Support HAL_PIXEL_FORMAT_BLOB" 2012-06-13 17:25:12 -07:00
Xavier Ducrohet
82c9791a50 am 088cab2a: am 35c48dcf: Update SDK revision files. 
* commit '088cab2af96a1ae227a7fccf0610801c0beb065b':
  Update SDK revision files.
 2012-06-13 13:03:37 -07:00
Xavier Ducrohet
088cab2af9 am 35c48dcf: Update SDK revision files. 
* commit '35c48dcfe16d8b43fb17524ccc6167d9b11114d2':
  Update SDK revision files.
 2012-06-13 13:00:00 -07:00
Xavier Ducrohet
35c48dcfe1 Update SDK revision files. 
Change-Id: Ib6e9e0c6a1aacef6e7a68d939318d901fb9b4bf3
 2012-06-13 12:54:21 -07:00
Eino-Ville Talvala
79c366593b Merge "EmulatedFakeCamera2: Minor fixes" 2012-06-13 12:09:38 -07:00
Eino-Ville Talvala
e26e64f2de EmulatedFakeCamera2: Add support for JPEG output, multiple streams 
Required to support Camera.takePicture()

Bug: 6243944
Change-Id: I60d7a161a7037c25428eac5a6f9327aff47da584
 2012-06-13 12:08:28 -07:00
Eino-Ville Talvala
2a2ada537a Emulator gralloc: Support HAL_PIXEL_FORMAT_BLOB 
Bug: 6243944
Change-Id: I2864bc59be9df8741639a291c71e2f65dde5bc0b
 2012-06-13 12:08:18 -07:00
Andrew Hsieh
0d044f5534 am 852f1ba2: am 0fced7b1: am 3f8b673b: Merge "ndk: Remove if_dl.h header" 
* commit '852f1ba2ea00da5890bfc479a2d89867c1a67e51':
  ndk: Remove if_dl.h header
 2012-06-12 17:24:26 -07:00
Andrew Hsieh
852f1ba2ea am 0fced7b1: am 3f8b673b: Merge "ndk: Remove if_dl.h header" 
* commit '0fced7b1f6150de6c893680060fb187da735f6fa':
  ndk: Remove if_dl.h header
 2012-06-12 17:21:55 -07:00
Andrew Hsieh
0fced7b1f6 am 3f8b673b: Merge "ndk: Remove if_dl.h header" 
* commit '3f8b673b24c5dc0cf0023554ead34a9a1e446dbd':
  ndk: Remove if_dl.h header
 2012-06-12 17:20:03 -07:00
Andrew Hsieh
3f8b673b24 Merge "ndk: Remove if_dl.h header" 2012-06-12 17:16:28 -07:00
Jean-Baptiste Queru
bf133cf2dd am 401a65b7: resolved conflicts for merge of 45cb1b0a to jb-dev-plus-aosp 
* commit '401a65b7846fb87991142d9caa4a6176f75bbe27':
  Fix Eclipse classpath file for ICS.
 2012-06-12 08:02:08 -07:00
Jean-Baptiste Queru
401a65b784 resolved conflicts for merge of 45cb1b0a to jb-dev-plus-aosp 
Change-Id: I50fb4331347a1921a5a75eb91a216c7e0499e2d6
 2012-06-12 07:58:42 -07:00