LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,040 Commits 2 Branches 0 Tags
54723fb6ac38cbefd2dbaf8c1e7a892765170d4c
Commit Graph

12040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
98e77475c1 am 4c5a8a60: am e4b3c7a3: Merge "Correct typo" 
* commit '4c5a8a606d57a36fbb61cb2a5128b66f83239b7e':
  Correct typo
 2012-12-12 15:24:28 -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
Igor Murashkin
f1b72a3757 Merge "Camera2: Fix a potential race condition in the readout thread" 2012-12-12 12:47:58 -08:00
Igor Murashkin
52f7c8d4c6 Merge "Camera2: Fix a deadlock when closing the camera" 2012-12-12 12:47:47 -08:00
Joe Malin
2c063c889a Android Training: Threads sample app 
Change-Id: I6d07871acad31807eb4bf06aa8406b722320680c
 2012-12-12 10:47:58 -08:00
Andrew Hsieh
ba9d4ed16d am e9401bf6: am 4bddb6f5: Merge "Fix <endian.h> and <sys/endian.h>" 
* commit 'e9401bf645591990427bcce88a109cb472419599':
  Fix <endian.h> and <sys/endian.h>
 2012-12-12 06:07:36 -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
66cb819500 am 7c1c45e4: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '7c1c45e449aea9141bd8cebb88c5fba08c704623':
 2012-12-10 15:21:28 -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
483a8796e8 am bae43244: am d8aa2895: Merge "SDK: fix sdk_repo build." 
* commit 'bae4324402ec0acc594a16af225f23dd76b28400':
  SDK: fix sdk_repo build.
 2012-12-10 13:38:33 -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
80f2e3af43 am 13a7d3c2: am 8109f4f5: am 7377374b: am 7ca28063: Add redirect for IAB v3 restructure. 
* commit '13a7d3c2d8853c943031052c43c3630876139d61':
  Add redirect for IAB v3 restructure.
 2012-12-10 09:30:15 -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
Derek Sollenberger
4dd755b180 Remove outdated FontLab app since Skia no longer uses it to tune 
gamma values.

Change-Id: I9a6409b9c2fa8563413ccf3a6545b330d896042a
 2012-12-10 11:23:13 -05:00
Dirk Dougherty
7ca2806399 Add redirect for IAB v3 restructure. 
Change-Id: I65ccc6767408977a9756b217168b819b71816c1f
 2012-12-09 17:09:26 -08:00
Dianne Hackborn
36b302ba18 am 3509481c: am f443913a: am 613e19b7: SDK Only: Fix search interaction with various samples. 
* commit '3509481cfae4b8dc0fdba4836bfc36e2bd04045e':
  SDK Only: Fix search interaction with various samples.
 2012-12-07 13:24:02 -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
Igor Murashkin
6edd7ab4a4 Camera2: Fix a potential race condition in the readout thread 
Change-Id: Ie4475c8433eaad7545430f7e01e222d074180e0e
 2012-12-07 12:34:20 -08:00
Igor Murashkin
0825f8b65b Camera2: Fix a deadlock when closing the camera 
Change-Id: I8b6be364ca90b0eed62ae03c1548680c0b2f0e64
 2012-12-07 12:32:00 -08:00
Stephen Hines
0e72fe1adb Update HelloCompute to use separate output bitmap. 
Change-Id: I236d35b1ce41099dcd18389983d694982f1c7f6c
 2012-12-07 11:24:52 -08:00
Andrew Hsieh
3f6f6a8844 am 7d5a4faa: am 0f30dd0d: Merge "Fix warning compiling samples with clang3.1" 
* commit '7d5a4faacecda23d6d7c7c8c622c34dd4fc90457':
  Fix warning compiling samples with clang3.1
 2012-12-06 11:01:30 -08:00
Andrew Hsieh
64031cb68b am 83c6e0c2: am aa33ae38: Merge "Refresh endian.h" 
* commit '83c6e0c28526908081ab39390f5f41e5fba64491':
  Refresh endian.h
 2012-12-06 11:01:29 -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
d715dedb42 am 69f82457: am 25be7400: Merge "Fix a ENOTUP/ENOTSUP typo" 
* commit '69f82457bd66ada421cbdce1bab8993a66f5ba97':
  Fix a ENOTUP/ENOTSUP typo
 2012-12-05 13:00:36 -08:00
John Spurlock
34bdeed8c4 Merge "Add "cts-dreams" to testrunner." 2012-12-05 06:51:39 -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
Igor Murashkin
53db6a1a21 Merge "EmulatedCamera2: Fix metadata symbols" 2012-12-04 17:26:39 -08:00
John Spurlock
8197f7db4a Add "cts-dreams" to testrunner. 
Change-Id: If743bea114ad38a15f65f4b3d309a2dad6bde313
 2012-12-04 17:13:11 -05:00
Andrew Hsieh
0acd271891 am d39deac4: am d613956f: Merge "Add missing SL_IID_ANDROIDBUFFERQUEUESOURCE in android-14 for ARM/X86" 
* commit 'd39deac4a664121bae98806f262857b59d46ddc7':
  Add missing SL_IID_ANDROIDBUFFERQUEUESOURCE in android-14 for ARM/X86
 2012-12-04 10:58:09 -08:00