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

10056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Hsieh
568cb2b2ef Merge "Fixed wrong package names in samples hello-jni and two-libs" 2012-06-28 09:57:23 -07:00
The Android Automerger
0525bed8df merge in jb-release history after reset to jb-dev 2012-06-27 14:05:22 -07:00
Andrew Hsieh
1513e9eab2 Fixed wrong package names in samples hello-jni and two-libs 
Fixed package names so tests project underneath can compile

Change-Id: Ia4e58e8caa5db65e05fdb2ec64e52c1564774899
 2012-06-27 11:29:31 -07:00
Scott Main
80be48a177 am e1ec055d: docs: a bunch of new reidrects; for search, videos, hello views, and a bunch of easter eggs 
* commit 'e1ec055dea478b3cd00f1a2ec8d544f2156a19a6':
  docs: a bunch of new reidrects; for search, videos, hello views, and a bunch of easter eggs
 2012-06-27 01:36:30 -07:00
Scott Main
e1ec055dea docs: a bunch of new reidrects; 
for search, videos, hello views, and a bunch of easter eggs

Change-Id: I13a8e6c0971292fb6036c307e2cbf2c4c07eca84
 2012-06-27 01:19:25 -07:00
Scott Main
c058522799 am 97324cf4: Merge "docs: submit latest set of redirects" into jb-dev 
* commit '97324cf453303e8e191d9268551a0928e828cd36':
  docs: submit latest set of redirects
 2012-06-26 22:01:16 -07:00
Scott Main
97324cf453 Merge "docs: submit latest set of redirects" into jb-dev 2012-06-26 21:58:53 -07:00
Scott Main
14c36089d8 docs: submit latest set of redirects 
Change-Id: I4bb033e0e6689bef328dddef1d28e4b2cbecb06d
 2012-06-26 21:57:14 -07:00
Andrew Hsieh
b6759b1620 am c7c40b68: Merge "ndk: Add crtbrand.c ; crtbegin_static.S includes "atexit.S" for x86/mips" 
* commit 'c7c40b68a22e1d52d906b89f4fa43dc93f3aeecf':
  ndk: Add crtbrand.c ; crtbegin_static.S includes "atexit.S" for x86/mips
 2012-06-26 14:34:03 -07:00
Andrew Hsieh
c7c40b68a2 Merge "ndk: Add crtbrand.c ; crtbegin_static.S includes "atexit.S" for x86/mips" 2012-06-26 14:22:50 -07:00
Anirudh Dewani
672fa25cea WiFi Direct Service Discovery sample 
Change-Id: Id5ac219cbf03a8a96203ed682f729df9bbb59fcd
 2012-06-26 14:06:59 -07:00
Andrew Hsieh
5e30a6ae14 ndk: Add crtbrand.c ; crtbegin_static.S includes "atexit.S" for x86/mips 
"atexit" isn't defined in libc.a for x86/mips (unlike their arm's counterpart).
Include atexit.S otherwise app using atexit() may fail to link statically.

Also, add crtbegin.c to brand crtbegin_static/dynamic.c with .note.ABI-tag
section of given API level.  See $NDK/gen-platforms.sh

Change-Id: I2fdbb92119e3ca2da2c1ced6d77e63136ec35c34
 2012-06-25 17:58:12 -07:00
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