LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,010 Commits 2 Branches 0 Tags
2293b51c64b75d3b6cdbdc4d0f5d790ef89ec55f
Commit Graph

11010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Hsieh
2293b51c64 am 9a204c55: Merge "Remove duplicated definitions of size_t and ssize_t" 
* commit '9a204c557fd0ba86e666b6d47c2b29b7894d76ba':
  Remove duplicated definitions of size_t and ssize_t
 2012-12-21 16:13:24 -08:00
Andrew Hsieh
9a204c557f Merge "Remove duplicated definitions of size_t and ssize_t" 2012-12-21 15:48:35 -08:00
Andrew Hsieh
7980acf254 Remove duplicated definitions of size_t and ssize_t 
See 3975cec694a0c9b42e3f7e671fcd678da92836c3

Change-Id: Ia40ff8de3ffe923fb983bb116b740942724c641a
 2012-12-21 22:29:26 +08:00
Andrew Hsieh
26d1e005e5 am 852b3581: Merge "Sync pthread.h and resolv.h" 
* commit '852b358185a910bb3bdc9cec1ef3752c9bb4c522':
  Sync pthread.h and resolv.h
 2012-12-20 11:04:06 -08:00
Andrew Hsieh
852b358185 Merge "Sync pthread.h and resolv.h" 2012-12-20 10:38:07 -08:00
Andrew Hsieh
9ca4e48605 Sync pthread.h and resolv.h 
See 9831ad3ce6bd5b22da16a275ed67e7236eae3d1f and
23d3e6b21b4b6debff87da8c6558495e564cc38e

Change-Id: I22c7bbda1cd763e5f67410cc2e4054292e71af04
 2012-12-20 19:08:54 +08:00
The Android Open Source Project
a8af928f4e Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I189f31812ca5c5a5a6fc95ed35bf38664c6afb6a
 2012-12-14 14:03:15 -08:00
The Android Automerger
35f8b6a16c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-13 15:30:39 -08:00
Joe Malin
34b168f642 am 92a7f64c: am fa8f593a: am 50600ba5: am a525bf71: am 1e083591: am 2c063c88: Android Training: Threads sample app 
* commit '92a7f64c12fb7a186ed554d4b3c09214bbcc390a':
  Android Training: Threads sample app
 2012-12-13 11:07:06 -08:00
Joe Malin
92a7f64c12 am fa8f593a: am 50600ba5: am a525bf71: am 1e083591: am 2c063c88: Android Training: Threads sample app 
* commit 'fa8f593a2adb12c7837972085cc63e8e0b12ebc6':
  Android Training: Threads sample app
 2012-12-13 11:04:56 -08:00
Joe Malin
fa8f593a2a am 50600ba5: am a525bf71: am 1e083591: am 2c063c88: Android Training: Threads sample app 
* commit '50600ba5d68e1e002bd8b6ca646be93f922d37ab':
  Android Training: Threads sample app
 2012-12-13 11:03:10 -08:00
Joe Malin
50600ba5d6 am a525bf71: am 1e083591: am 2c063c88: Android Training: Threads sample app 
* commit 'a525bf719545fc315d03c1c6ee74f61e8dda03e0':
  Android Training: Threads sample app
 2012-12-13 11:00:59 -08:00
Joe Malin
a525bf7195 am 1e083591: am 2c063c88: Android Training: Threads sample app 
* commit '1e083591aed6b77408f6fce363bd48e63db92ed4':
  Android Training: Threads sample app
 2012-12-13 10:58:59 -08:00
Joe Malin
1e083591ae am 2c063c88: Android Training: Threads sample app 
* commit '2c063c889aa816e0de91bf17fdc0c78f48d5e2d0':
  Android Training: Threads sample app
 2012-12-13 10:57:14 -08:00
Dirk Dougherty
5c2bd5a4a5 am 298ed7d6: am 4b5dc0ce: am 01b1a873: Merge "Add ko and ru to validLangs." into jb-mr1-dev 
* commit '298ed7d64025dd44eac5b318f414d4dc23e6f015':
  Add ko and ru to validLangs.
 2012-12-13 10:55:20 -08:00
Dirk Dougherty
298ed7d640 am 4b5dc0ce: am 01b1a873: Merge "Add ko and ru to validLangs." into jb-mr1-dev 
* commit '4b5dc0ce4dc52d1e3ccf9e8d09dd0af6568096dd':
  Add ko and ru to validLangs.
 2012-12-13 10:54:15 -08:00
Dirk Dougherty
4b5dc0ce4d am 01b1a873: Merge "Add ko and ru to validLangs." into jb-mr1-dev 
* commit '01b1a8739b338f50393e7c113d3a168710b45679':
  Add ko and ru to validLangs.
 2012-12-13 10:52:28 -08:00
Dirk Dougherty
01b1a8739b Merge "Add ko and ru to validLangs." into jb-mr1-dev 2012-12-13 10:34:26 -08:00
Dirk Dougherty
22c9415195 Add ko and ru to validLangs. 
Change-Id: I40d1a8e82d4b30cc2e787826252a85161e0157d8
 2012-12-13 10:00:30 -08:00
Andrew Hsieh
4c5a8a606d am e4b3c7a3: Merge "Correct typo" 
* commit 'e4b3c7a31d9647b468384668d2cee88295464a71':
  Correct typo
 2012-12-12 15:22:41 -08:00
Andrew Hsieh
e4b3c7a31d Merge "Correct typo" 2012-12-12 15:02:04 -08:00
Joe Malin
2c063c889a Android Training: Threads sample app 
Change-Id: I6d07871acad31807eb4bf06aa8406b722320680c
 2012-12-12 10:47:58 -08:00
Andrew Hsieh
e9401bf645 am 4bddb6f5: Merge "Fix <endian.h> and <sys/endian.h>" 
* commit '4bddb6f5f7f1b00f2263b059156dfc07efea920b':
  Fix <endian.h> and <sys/endian.h>
 2012-12-12 06:05:12 -08:00
Andrew Hsieh
4bddb6f5f7 Merge "Fix <endian.h> and <sys/endian.h>" 2012-12-12 05:38:32 -08:00
Andrew Hsieh
d30385fc7c Correct typo 
Change-Id: I150ee24f93d1a4fe16de938dafb335a9f1a171b0
 2012-12-12 10:34:21 +08:00
Andrew Hsieh
ab13dd0e7a Fix <endian.h> and <sys/endian.h> 
See 4fa35d8ae80c175425e9525831d7b6a71a3ada60

Change-Id: Ia14386f2e762fd7c0a1fc8f3e7cf8c0ce05b1dd5
 2012-12-12 10:04:53 +08:00
The Android Open Source Project
7c1c45e449 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I15433e982bbaa80391db117f5f1abd40469c70a6
 2012-12-10 15:19:19 -08:00
Raphael Moll
bae4324402 am d8aa2895: Merge "SDK: fix sdk_repo build." 
* commit 'd8aa2895f40018b13b1443144b5355d4b84f8acf':
  SDK: fix sdk_repo build.
 2012-12-10 13:36:41 -08:00
Raphael Moll
d8aa2895f4 Merge "SDK: fix sdk_repo build." 2012-12-10 13:17:16 -08:00
Raphael Moll
437419089c SDK: fix sdk_repo build. 
The makefile for sdk_repo looks for the repository/addon XSD files in the tree,
these paths needed to be adjusted due to the recent reorganization.

Change-Id: I50120542f78dc72da51b4d5377214c064ec68c01
 2012-12-10 13:06:52 -08:00
The Android Automerger
a6485a73ca merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-10 13:05:52 -08:00
Dirk Dougherty
13a7d3c2d8 am 8109f4f5: am 7377374b: am 7ca28063: Add redirect for IAB v3 restructure. 
* commit '8109f4f5bbca8aa6a974a4b639b07831ae19743e':
  Add redirect for IAB v3 restructure.
 2012-12-10 09:28:40 -08:00
Dirk Dougherty
8109f4f5bb am 7377374b: am 7ca28063: Add redirect for IAB v3 restructure. 
* commit '7377374bf67bb99854a06032f8ca1c8781878ff7':
  Add redirect for IAB v3 restructure.
 2012-12-10 09:27:10 -08:00
Dirk Dougherty
7377374bf6 am 7ca28063: Add redirect for IAB v3 restructure. 
* commit '7ca280639960cc18ad8a9b398c1e059df27597b5':
  Add redirect for IAB v3 restructure.
 2012-12-10 09:25:25 -08:00
Dirk Dougherty
7ca2806399 Add redirect for IAB v3 restructure. 
Change-Id: I65ccc6767408977a9756b217168b819b71816c1f
 2012-12-09 17:09:26 -08:00
Dianne Hackborn
3509481cfa am f443913a: am 613e19b7: SDK Only: Fix search interaction with various samples. 
* commit 'f443913ad3e44403819f3c740bcf30bc18f74170':
  SDK Only: Fix search interaction with various samples.
 2012-12-07 13:22:26 -08:00
Dianne Hackborn
f443913ad3 am 613e19b7: SDK Only: Fix search interaction with various samples. 
* commit '613e19b74072896464e1980d84dc27c2a9f4471a':
  SDK Only: Fix search interaction with various samples.
 2012-12-07 13:21:03 -08:00
Andrew Hsieh
7d5a4faace am 0f30dd0d: Merge "Fix warning compiling samples with clang3.1" 
* commit '0f30dd0d198b9806239c366ae327f6b83bcdd396':
  Fix warning compiling samples with clang3.1
 2012-12-06 10:59:15 -08:00
Andrew Hsieh
83c6e0c285 am aa33ae38: Merge "Refresh endian.h" 
* commit 'aa33ae38aee7be1acea5259332aea7954d7fa6e8':
  Refresh endian.h
 2012-12-06 10:59:06 -08:00
Andrew Hsieh
0f30dd0d19 Merge "Fix warning compiling samples with clang3.1" 2012-12-06 04:51:55 -08:00
Andrew Hsieh
4ba2dd5080 Fix warning compiling samples with clang3.1 
Change-Id: I166cc64d34dcf8dd99fc28f2556306b8795e3c7e
 2012-12-06 18:10:46 +08:00
Andrew Hsieh
aa33ae38ae Merge "Refresh endian.h" 2012-12-05 21:28:13 -08:00
Dianne Hackborn
613e19b740 SDK Only: Fix search interaction with various samples. 
These were broken where pressing back would not clear the
search filter.

Change-Id: Iafd4a497a31a9689efabe7d92f44618a5e8dc80c
 2012-12-05 15:17:31 -08:00
Andrew Hsieh
69f82457bd am 25be7400: Merge "Fix a ENOTUP/ENOTSUP typo" 
* commit '25be7400a9b0cf205a2188663e137610feb12111':
  Fix a ENOTUP/ENOTSUP typo
 2012-12-05 06:05:04 -08:00
Andrew Hsieh
25be7400a9 Merge "Fix a ENOTUP/ENOTSUP typo" 2012-12-05 05:03:32 -08:00
Andrew Hsieh
ef48154850 Fix a ENOTUP/ENOTSUP typo 
See ecb53eab4b63a777c189f880e7f88ebbe0e8101b

Change-Id: Id0cd72f3ccc6e4ecb1bd57045e2f46be234378fa
 2012-12-05 13:05:15 +08:00
Andrew Hsieh
7361c3c7bb Refresh endian.h 
See http://code.google.com/p/android/issues/detail?id=39824
and b15c58bb0fe55f076751acd7a5d00ded0ec33963

Change-Id: I71858f6d15adb688e0b05685e55582f0f1ddae54
 2012-12-05 12:42:18 +08:00
Andrew Hsieh
d39deac4a6 am d613956f: Merge "Add missing SL_IID_ANDROIDBUFFERQUEUESOURCE in android-14 for ARM/X86" 
* commit 'd613956fdff6250aa9f143b84332c840224608db':
  Add missing SL_IID_ANDROIDBUFFERQUEUESOURCE in android-14 for ARM/X86
 2012-12-04 10:56:40 -08:00
Andrew Hsieh
d613956fdf Merge "Add missing SL_IID_ANDROIDBUFFERQUEUESOURCE in android-14 for ARM/X86" 2012-12-04 10:50:09 -08:00
Andrew Hsieh
c45fca2926 Add missing SL_IID_ANDROIDBUFFERQUEUESOURCE in android-14 for ARM/X86 
SL_IID_ANDROIDBUFFERQUEUESOURCE is new in android-14 and already
declared in platforms/android-14/include/SLES/OpenSLES_Android.h,
but it's missing from libOpenSLES.so

It turns out both *.functions.txt and *.variables.txt should exist
for gen-platforms.sh to generate new *.so.  Add *.functions.txt otherwise
development/ndk/platforms/android-14/arch-(arm|x86)/symbols/libOpenSLES.so.variables.txt
are ignored.  Note that MIPS is correct all along.

See http://code.google.com/p/android/issues/detail?id=40625

Change-Id: I826f13a93c9f3eaf648a59e7e844b53be5f7fba0
 2012-12-04 20:23:41 +08:00