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

9526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
f94c1a54d8 Merge "Merge remote-tracking branch 'goog/ics-aah'" 2012-04-03 13:05:55 -07:00
Raphael Moll
a01353be9d am 048b8099: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/development into ics-scoop-plus-aosp 
* commit '048b80994f0199c57cfd5fea9a2d4b1ef87cc1fd':
 2012-04-03 11:24:44 -07:00
Raphael Moll
ba4bde8517 am 7ebe18f4: (-s ours) am 07ef63f4: am 2edb02ab: SDK: generate repo in xsd v6. DO NOT MERGE. 
* commit '7ebe18f4d4d259732f95075f95e0bd5362816632':
  SDK: generate repo in xsd v6. DO NOT MERGE.
 2012-04-03 11:24:43 -07:00
Raphael Moll
048b80994f Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/development into ics-scoop-plus-aosp 2012-04-03 11:22:36 -07:00
Raphael Moll
b4b157a5df am 8c0676c2: am 2edb02ab: SDK: generate repo in xsd v6. DO NOT MERGE. 
* commit '8c0676c2f9e3d4bdb551815ecc859552c1a863fe':
  SDK: generate repo in xsd v6. DO NOT MERGE.
 2012-04-03 11:22:31 -07:00
Raphael Moll
7ebe18f4d4 am 07ef63f4: am 2edb02ab: SDK: generate repo in xsd v6. DO NOT MERGE. 
* commit '07ef63f4dbd6121b1bbbef3c72316ae9a2db555b':
  SDK: generate repo in xsd v6. DO NOT MERGE.
 2012-04-03 11:22:28 -07:00
Mike Lockwood
4403d81204 Merge remote-tracking branch 'goog/ics-aah' 2012-04-03 11:21:20 -07:00
Raphael Moll
07ef63f4db am 2edb02ab: SDK: generate repo in xsd v6. DO NOT MERGE. 
* commit '2edb02ab24e0ba19065cb4d2919892c6ac268921':
  SDK: generate repo in xsd v6. DO NOT MERGE.
 2012-04-03 11:19:34 -07:00
Raphael Moll
8c0676c2f9 am 2edb02ab: SDK: generate repo in xsd v6. DO NOT MERGE. 
* commit '2edb02ab24e0ba19065cb4d2919892c6ac268921':
  SDK: generate repo in xsd v6. DO NOT MERGE.
 2012-04-03 11:19:23 -07:00
Andrew Hsieh
21b5db3160 am 6e6306d1: am 6ad643e1: am 34ccdaa8: Merge "ndk: ANativeActivity: Fix \'clazz\' member documentation." 
* commit '6e6306d110f077324ca0f96890e32e958ecfb6e3':
  ndk: ANativeActivity: Fix 'clazz' member documentation.
 2012-04-03 07:29:52 -07:00
Andrew Hsieh
6e6306d110 am 6ad643e1: am 34ccdaa8: Merge "ndk: ANativeActivity: Fix \'clazz\' member documentation." 
* commit '6ad643e1a98cb03603252715ad91fa69d6c5e4f3':
  ndk: ANativeActivity: Fix 'clazz' member documentation.
 2012-04-03 07:27:36 -07:00
Andrew Hsieh
6ad643e1a9 am 34ccdaa8: Merge "ndk: ANativeActivity: Fix \'clazz\' member documentation." 
* commit '34ccdaa87b25c2456a76aafcf09a66b2fab236ff':
  ndk: ANativeActivity: Fix 'clazz' member documentation.
 2012-04-03 07:25:15 -07:00
Andrew Hsieh
34ccdaa87b Merge "ndk: ANativeActivity: Fix 'clazz' member documentation." 2012-04-03 04:32:21 -07:00
David 'Digit' Turner
16c0f25354 ndk: ANativeActivity: Fix 'clazz' member documentation. 
As discussed on android-ndk, the member is misnamed

Change-Id: I2a5a1c8dce327ddf9ab7a4d14f4e2fdf62808753
 2012-04-03 19:30:08 +08:00
Andrew Hsieh
77d40ed7f4 Merge "Refresh development/ndk/platforms/android-9/arch-x86/include/machine" 2012-04-02 21:16:37 -07:00
Jason Sams
5ccb5d6b86 Merge "Relax FP requirements" 2012-04-02 15:26:05 -07:00
Raphael Moll
2edb02ab24 SDK: generate repo in xsd v6. DO NOT MERGE. 
Requires change Ib6f5b03c and change I6ba33a96.

Change-Id: Ib42676359289e731d045c4a1e26c85fe5868d633
 2012-04-02 15:21:41 -07:00
Trevor Johns
f0e8a2e538 am 6a635b88: am fcc3a894: am 4947ffb9: Merge "Docs: Fixing broken link in TtsEngine/_index.html" into ics-mr1 
* commit '6a635b882abb7bedd1d833ccfb26cdc8bdd5435e':
 2012-04-02 14:57:38 -07:00
Trevor Johns
c813646bc7 am 93a4e8e9: am 9be60a23: am 4947ffb9: Merge "Docs: Fixing broken link in TtsEngine/_index.html" into ics-mr1 
* commit '93a4e8e9a076fbe82d2750e17e26abbeaeef3d1e':
  Docs: Fixing broken link in TtsEngine/_index.html
 2012-04-02 14:55:54 -07:00
Trevor Johns
6a635b882a am fcc3a894: am 4947ffb9: Merge "Docs: Fixing broken link in TtsEngine/_index.html" into ics-mr1 
* commit 'fcc3a894f6e45cb23150c7f5f4406a6fdf01c094':
 2012-04-02 14:55:04 -07:00
Trevor Johns
93a4e8e9a0 am 9be60a23: am 4947ffb9: Merge "Docs: Fixing broken link in TtsEngine/_index.html" into ics-mr1 
* commit '9be60a23cd67788ee4187223250c3b73427915ef':
  Docs: Fixing broken link in TtsEngine/_index.html
 2012-04-02 14:53:38 -07:00
Trevor Johns
aa49eb26a9 am 4947ffb9: Merge "Docs: Fixing broken link in TtsEngine/_index.html" into ics-mr1 
* commit '4947ffb99b5fd271549c33ff9aa3d3f88a27b0d7':
  Docs: Fixing broken link in TtsEngine/_index.html
 2012-04-02 14:52:23 -07:00
Trevor Johns
fcc3a894f6 am 4947ffb9: Merge "Docs: Fixing broken link in TtsEngine/_index.html" into ics-mr1 
* commit '4947ffb99b5fd271549c33ff9aa3d3f88a27b0d7':
  Docs: Fixing broken link in TtsEngine/_index.html
 2012-04-02 14:51:44 -07:00
Trevor Johns
9be60a23cd am 4947ffb9: Merge "Docs: Fixing broken link in TtsEngine/_index.html" into ics-mr1 
* commit '4947ffb99b5fd271549c33ff9aa3d3f88a27b0d7':
  Docs: Fixing broken link in TtsEngine/_index.html
 2012-04-02 14:51:42 -07:00
Trevor Johns
4947ffb99b Merge "Docs: Fixing broken link in TtsEngine/_index.html" into ics-mr1 2012-04-02 14:49:32 -07:00
Andrew Hsieh
5e00ed25de am 2384a4dc: am d63680fb: am 9487df9a: Merge "Remove auto-gen project.properties" 
* commit '2384a4dceedc1218aaaf62bb91e4a05cdbe3425d':
  Remove auto-gen project.properties
 2012-04-02 08:37:48 -07:00
Andrew Hsieh
5ac31500c8 am 7cd62f76: am ed42b4b0: am 2bbd700e: Merge "ndk: <dlfcn.h>: dladdr() takes a \'const void*\' parameter, not \'void*\'" 
* commit '7cd62f769c6cf5ae46a29230ddf8755f0a9ccc07':
  ndk: <dlfcn.h>: dladdr() takes a 'const void*' parameter, not 'void*'
 2012-04-02 08:37:47 -07:00
Andrew Hsieh
f1318a1278 am 45499a44: am e3f5656b: am 48aaee2c: Merge "Native media sample app for NDK API level 14" 
* commit '45499a4402cca08d2b9b427d0f3364d7f25dff08':
  Native media sample app for NDK API level 14
 2012-04-02 08:37:46 -07:00
Andrew Hsieh
359ec88879 am 12866f38: am 93e83437: am 2c10ade9: Merge "ndk: android-9: Add missing <sys/eventfd.h> header" 
* commit '12866f38d3a3f3ec1de0966e10d35d7bf1919182':
  ndk: android-9: Add missing <sys/eventfd.h> header
 2012-04-02 08:37:45 -07:00
Andrew Hsieh
338e5f5ee0 am aef6a76a: am f12cbd40: am ea94d94a: Merge "ndk: <signal.h>: Increase _NSIG definition to 64" 
* commit 'aef6a76afbaf0643acc250cf75eb11a251ecce9a':
  ndk: <signal.h>: Increase _NSIG definition to 64
 2012-04-02 08:37:44 -07:00
Andrew Hsieh
708809c0b0 am a3f30dbe: am 964684ba: am 535478dd: Merge "ndk: <pthread.h>: formatting + updates" 
* commit 'a3f30dbed77c1382364f816b5bb5111c1c7f37d9':
  ndk: <pthread.h>: formatting + updates
 2012-04-02 08:37:43 -07:00
Andrew Hsieh
e90773a89e am d3d90fb6: am 87d906b2: am 5f37cda9: Merge "ndk: <unistd.h>: minor cleanup" 
* commit 'd3d90fb611bc49577eefa59b4f6f10fed3c74c42':
  ndk: <unistd.h>: minor cleanup
 2012-04-02 08:37:41 -07:00
Andrew Hsieh
1429f9e7d9 am 60df0c2b: am 1f52f49c: am 3e7f4c62: Merge "ndk: <sys/cdefs.h> minor update" 
* commit '60df0c2b83f3ab3ce121e569e7779b6d4796c2d2':
  ndk: <sys/cdefs.h> minor update
 2012-04-02 08:37:40 -07:00
Andrew Hsieh
a7db1541a5 am 84bd1184: am b8e1cdda: am 7ae589ca: Merge "ndk: minor header update" 
* commit '84bd1184b9cf80cd4bf76fcf650f8de8ca35aca5':
  ndk: minor header update
 2012-04-02 08:37:39 -07:00
Andrew Hsieh
e3699d2e9b am e00aea97: am 2128eb22: am 61e72dbc: Merge "ndk: Fix ipv6 related headers" 
* commit 'e00aea9715d61fcf3816dbb0c9b9434081b317ef':
  ndk: Fix ipv6 related headers
 2012-04-02 08:37:38 -07:00
Andrew Hsieh
45d8a3b77c am b907051f: (-s ours) am 708a75ba: am ad05e868: Merge "ndk: Fix <sys/atomics.h> declarations." 
* commit 'b907051f108b7c0a75845c49bb2e540ecc36fcb4':
  ndk: Fix <sys/atomics.h> declarations.
 2012-04-02 08:37:37 -07:00
Andrew Hsieh
c64973f7bc am 95b9de91: am 0480b898: am 26f8b539: Merge "ndk: minor update to <netinet/...> headers." 
* commit '95b9de9149d78146c99e06d2e7c75b723a2c8899':
  ndk: minor update to <netinet/...> headers.
 2012-04-02 08:00:29 -07:00
Andrew Hsieh
2384a4dcee am d63680fb: am 9487df9a: Merge "Remove auto-gen project.properties" 
* commit 'd63680fbc4da40fc6b29039e04d6a38137d38021':
  Remove auto-gen project.properties
 2012-04-02 07:58:15 -07:00
Andrew Hsieh
7cd62f769c am ed42b4b0: am 2bbd700e: Merge "ndk: <dlfcn.h>: dladdr() takes a \'const void*\' parameter, not \'void*\'" 
* commit 'ed42b4b02d1514f72664a9d6865a5523676403ed':
  ndk: <dlfcn.h>: dladdr() takes a 'const void*' parameter, not 'void*'
 2012-04-02 07:58:14 -07:00
Andrew Hsieh
45499a4402 am e3f5656b: am 48aaee2c: Merge "Native media sample app for NDK API level 14" 
* commit 'e3f5656b942ed46ee9857e2819b5eef40ba95e9b':
  Native media sample app for NDK API level 14
 2012-04-02 07:58:13 -07:00
Andrew Hsieh
12866f38d3 am 93e83437: am 2c10ade9: Merge "ndk: android-9: Add missing <sys/eventfd.h> header" 
* commit '93e83437cc2b396033d3e5f5ec7e1e4c88b33cbe':
  ndk: android-9: Add missing <sys/eventfd.h> header
 2012-04-02 07:58:12 -07:00
Andrew Hsieh
aef6a76afb am f12cbd40: am ea94d94a: Merge "ndk: <signal.h>: Increase _NSIG definition to 64" 
* commit 'f12cbd4097f0d5557eb250c63785348b57bb552a':
  ndk: <signal.h>: Increase _NSIG definition to 64
 2012-04-02 07:58:11 -07:00
Andrew Hsieh
a3f30dbed7 am 964684ba: am 535478dd: Merge "ndk: <pthread.h>: formatting + updates" 
* commit '964684ba5b1a9254d1505b0ac9cc6fd43c5db1c9':
  ndk: <pthread.h>: formatting + updates
 2012-04-02 07:58:10 -07:00
Andrew Hsieh
d3d90fb611 am 87d906b2: am 5f37cda9: Merge "ndk: <unistd.h>: minor cleanup" 
* commit '87d906b24376757b8b82d49698bb4731e3e9ad94':
  ndk: <unistd.h>: minor cleanup
 2012-04-02 07:58:09 -07:00
Andrew Hsieh
60df0c2b83 am 1f52f49c: am 3e7f4c62: Merge "ndk: <sys/cdefs.h> minor update" 
* commit '1f52f49c350f68b66e929131ecd7d793e05503e1':
  ndk: <sys/cdefs.h> minor update
 2012-04-02 07:58:07 -07:00
Andrew Hsieh
84bd1184b9 am b8e1cdda: am 7ae589ca: Merge "ndk: minor header update" 
* commit 'b8e1cdda80fb3aee075e3633c7c0818e21e33ea9':
  ndk: minor header update
 2012-04-02 07:58:06 -07:00
Andrew Hsieh
e00aea9715 am 2128eb22: am 61e72dbc: Merge "ndk: Fix ipv6 related headers" 
* commit '2128eb22fd24ff4c6ec955f79950e0cebf7e448c':
  ndk: Fix ipv6 related headers
 2012-04-02 07:58:06 -07:00
Andrew Hsieh
b907051f10 am 708a75ba: am ad05e868: Merge "ndk: Fix <sys/atomics.h> declarations." 
* commit '708a75ba605e9801d704cc3f6d5168a0f849f7a9':
  ndk: Fix <sys/atomics.h> declarations.
 2012-04-02 07:58:05 -07:00
Andrew Hsieh
95b9de9149 am 0480b898: am 26f8b539: Merge "ndk: minor update to <netinet/...> headers." 
* commit '0480b898713f17ab9fd89e88637403c51fbca30b':
  ndk: minor update to <netinet/...> headers.
 2012-04-02 07:58:04 -07:00
Andrew Hsieh
d63680fbc4 am 9487df9a: Merge "Remove auto-gen project.properties" 
* commit '9487df9a0f54bc1b572dff04a6b4c9f741d88d42':
  Remove auto-gen project.properties
 2012-04-02 07:55:47 -07:00