LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,993 Commits 2 Branches 0 Tags
edc463c5df0678a02140e7ead7f87f4b35f64cc4
Commit Graph

9993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
edc463c5df Reconcile with jb-release 
Change-Id: If02a97e5db71339a785db874c40b20905169bd10
 2012-06-22 15:20:11 -07:00
The Android Automerger
af9c383a63 merge in jb-release history after reset to jb-dev 2012-06-22 15:04:25 -07:00
The Android Open Source Project
d38cf456ad Reconcile with jb-release 
Change-Id: Ia28fbfff99d30bf1f119f20b0265d96e8c3ddacd
 2012-06-22 12:37:04 -07:00
Raphael Moll
11b954f619 am 7fa6b8dd: Update SDK Windows USB driver definition. 
* commit '7fa6b8dd1bcc351bd29e437eb3cb9f2acc7d7eb9':
  Update SDK Windows USB driver definition.
 2012-06-22 09:57:15 -07:00
The Android Automerger
fc7276f9a8 merge in jb-release history after reset to jb-dev 2012-06-22 09:47:45 -07:00
Raphael Moll
7fa6b8dd1b Update SDK Windows USB driver definition. 
Change-Id: Ia4ad0453599476eea72fcd90f7c200ec57490d3f
 2012-06-22 09:43:25 -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
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
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
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
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
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
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
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
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
The Android Automerger
7704524573 merge in jb-release history after reset to jb-dev 2012-06-14 07:00:08 -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
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
401a65b784 resolved conflicts for merge of 45cb1b0a to jb-dev-plus-aosp 
Change-Id: I50fb4331347a1921a5a75eb91a216c7e0499e2d6
 2012-06-12 07:58:42 -07:00
Jean-Baptiste Queru
45cb1b0a85 am 376154d4: Merge "Fix Eclipse classpath file for ICS." 
* commit '376154d427968e3a43088860fab81d9de5bf7270':
  Fix Eclipse classpath file for ICS.
 2012-06-12 07:46:26 -07:00
Jean-Baptiste Queru
376154d427 Merge "Fix Eclipse classpath file for ICS." 2012-06-12 07:31:50 -07:00
Andrew Hsieh
62ef547786 ndk: Remove if_dl.h header 
Remove AF_LINK and sockaddr_dl which are specpfic to BSD
(ie. doesn't exist in Linux)

Change-Id: I47fe4cdf76df14af99eaa17cfc366a65aee3f5ae
 2012-06-12 10:38:00 +08:00
Xavier Ducrohet
98a05b894e am 21f4ca57: am 74ed92d3: Merge "Move emugl system code to development.git" 
* commit '21f4ca579e58e9a2eaad841f5174eba44c926153':
  Move emugl system code to development.git
 2012-06-07 12:19:21 -07:00
Xavier Ducrohet
21f4ca579e am 74ed92d3: Merge "Move emugl system code to development.git" 
* commit '74ed92d325ec1eb9287a79fff3ca62c7f0f864f8':
  Move emugl system code to development.git
 2012-06-07 12:17:21 -07:00
Xavier Ducrohet
74ed92d325 Merge "Move emugl system code to development.git" 2012-06-07 12:13:23 -07:00
The Android Open Source Project
1d1b78daa7 Reconcile with jb-release 
Change-Id: I0f90bd02e18ed8b5e8b3e2d39d6462d94969e3e4
 2012-06-07 07:48:52 -07:00
Xavier Ducrohet
344e27f238 am e0db6a0c: am 392863b7: Merge "Remove tab only if tab exists." 
* commit 'e0db6a0c5523678f42229e99ea4598dc52b862eb':
  Remove tab only if tab exists.
 2012-06-06 14:52:36 -07:00
Xavier Ducrohet
e0db6a0c55 am 392863b7: Merge "Remove tab only if tab exists." 
* commit '392863b774874dff5ca4df3d336c5d459f014697':
  Remove tab only if tab exists.
 2012-06-06 14:50:50 -07:00
Xavier Ducrohet
392863b774 Merge "Remove tab only if tab exists." 2012-06-06 14:44:26 -07:00
Jesse Hall
56513f5ff4 Move emugl system code to development.git 
Because of the way the SDK and Android system images are branched,
host code that goes into the SDK tools can't live in the same
repository as code that goes into the system image. This change keeps
the emugl host code in sdk.git/emulator/opengl while moving the emugl
system code to development.git/tools/emulator/opengl.

A few changes were made beyond simply cloning the directories:

(a) Makefiles were modified to only build the relevant components. Not
    doing so would break the build due to having multiple rule
    definitions.

(b) Protocol spec files were moved from the guest encoder directories
    to the host decoder directories. The decoder must support older
    versions of the protocol, but not newer versions, so it makes
    sense to keep the latest version of the protocol spec with the
    decoder.

(c) Along with that, the encoder is now built from checked in
    generated encoder source rather than directly from the protocol
    spec.  The generated code must be updated manually. This makes it
    possible to freeze the system encoder version without freezing the
    host decoder version, and also makes it very obvious when a
    protocol changes is happening that will require special
    backwards-compatibility support in the decoder/renderer.

(d) Host-only and system-only code were removed from the repository
    where they aren't used.

(e) README and DESIGN documents were updated to reflect this split.

No actual source code was changed due to the above.

Change-Id: I2c936101ea0405b372750d36ba0f01e84d719c43
 2012-06-06 09:46:29 -07:00
The Android Automerger
50a5d15e3d merge in jb-release history after reset to jb-dev 2012-06-05 06:52:17 -07:00
Dianne Hackborn
4914a5f37b am 80df91c7: New API demos for retained fragments with loaders. 
* commit '80df91c7f2ac155c1cf4c3337f8db5a4bf5426b5':
  New API demos for retained fragments with loaders.
 2012-06-04 11:21:34 -07:00
Dianne Hackborn
80df91c7f2 New API demos for retained fragments with loaders. 
Also tweak the cursor loader samples to filter out query
callbacks that don't change the filter, to avoid restarting the
loader on a configuration change.

Change-Id: Iac9293fed45e127698be59262d68b0b59a8ec9ce
 2012-06-04 11:12:37 -07:00
The Android Automerger
2d69b07115 merge in jb-release history after reset to jb-dev 2012-06-03 06:00:33 -07:00
Andrew Hsieh
295ba8d381 am 93122516: am c424ad10: Merge "ndk: Remove prebuilt C runtime objects. Add sources instead." 
* commit '93122516a7afb92a4581da51305d2ce208757a22':
  ndk: Remove prebuilt C runtime objects. Add sources instead.
 2012-06-01 04:04:52 -07:00
Andrew Hsieh
93122516a7 am c424ad10: Merge "ndk: Remove prebuilt C runtime objects. Add sources instead." 
* commit 'c424ad10606977edab8d81a39eca68ddf00ec686':
  ndk: Remove prebuilt C runtime objects. Add sources instead.
 2012-06-01 04:02:51 -07:00
Andrew Hsieh
c424ad1060 Merge "ndk: Remove prebuilt C runtime objects. Add sources instead." 2012-06-01 03:51:09 -07:00