LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,490 Commits 2 Branches 0 Tags
df4559d9a58acdcec914f2df5d40735895c0ed48
Commit Graph

13490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
df4559d9a5 merge in master-release history after reset to master 2014-03-13 05:49:35 -07:00
Trevor Johns
d43bf2c371 am f62824c6: am 9d563550: Merge "Align "from code" parent-child preference flow with "from XML"" 
* commit 'f62824c658006c620be775ca82b74fcc6f82b59c':
  Align "from code" parent-child preference flow with "from XML"
 2014-03-12 19:56:45 +00:00
Alexander Lucas
dfc9958fa6 am 23f9bb62: am cd1255d1: am 4362d331: resolved conflicts for merge of 6da9c2ed to klp-ub-dev 
* commit '23f9bb62da2c1b8257ea656c0b14c2e0fca9648b':
  Updating build metadata for march sample push.
 2014-03-12 15:18:58 +00:00
Alexander Lucas
19377d9176 am d393b918: am 58c6156e: am 94f80bce: am a780ba4b: Adding browsable prebuilt samples for march push 
* commit 'd393b9182094bacaa99d9387c39ff1abbee94977':
  Adding browsable prebuilt samples for march push
 2014-03-12 15:18:57 +00:00
Trevor Johns
f62824c658 am 9d563550: Merge "Align "from code" parent-child preference flow with "from XML"" 
* commit '9d5635501a9fdf2f9ef5b51a4be021622f2f9a67':
  Align "from code" parent-child preference flow with "from XML"
 2014-03-11 23:22:56 +00:00
Trevor Johns
9d5635501a Merge "Align "from code" parent-child preference flow with "from XML"" 2014-03-11 19:52:17 +00:00
Alexander Lucas
23f9bb62da am cd1255d1: am 4362d331: resolved conflicts for merge of 6da9c2ed to klp-ub-dev 
* commit 'cd1255d19cf03b6f0d463b48e0ad6eb8b5c57b57':
  Updating build metadata for march sample push.
 2014-03-11 19:18:42 +00:00
Alexander Lucas
d393b91820 am 58c6156e: am 94f80bce: am a780ba4b: Adding browsable prebuilt samples for march push 
* commit '58c6156e0b9a33ed64af5e5849ba1a80fd5ac0a2':
  Adding browsable prebuilt samples for march push
 2014-03-11 19:18:40 +00:00
Alexander Lucas
cd1255d19c am 4362d331: resolved conflicts for merge of 6da9c2ed to klp-ub-dev 
* commit '4362d331f0ee5257b881a346fce63348e880fa1c':
  Updating build metadata for march sample push.
 2014-03-11 17:44:32 +00:00
Alexander Lucas
58c6156e0b am 94f80bce: am a780ba4b: Adding browsable prebuilt samples for march push 
* commit '94f80bce07febc80df1372fc84514b51c7b1e8c7':
  Adding browsable prebuilt samples for march push
 2014-03-11 17:44:14 +00:00
Alexander Lucas
4362d331f0 resolved conflicts for merge of 6da9c2ed to klp-ub-dev 
Change-Id: I2997c1204ff7aa9728f4df782fefe9d413bfbba7
 2014-03-10 15:02:25 -07:00
Alexander Lucas
6da9c2edfe Merge "Updating build metadata for march sample push." into klp-docs 2014-03-10 21:45:52 +00:00
Alexander Lucas
94f80bce07 am a780ba4b: Adding browsable prebuilt samples for march push 
* commit 'a780ba4b15cbe69e7ad74c34c21ccef5e8cdce23':
  Adding browsable prebuilt samples for march push
 2014-03-10 19:49:41 +00:00
Alexander Lucas
a780ba4b15 Adding browsable prebuilt samples for march push 
Change-Id: I952db10d9c9acb4940db08a07789347ea2effe4d
 2014-03-10 09:21:36 -07:00
Alexander Lucas
97c8590ca8 Updating build metadata for march sample push. 
Change-Id: Ic8f6e2adce61c76cfb3e3c6db96f13c915be7a63
 2014-03-07 15:00:38 -08:00
The Android Automerger
57d5484c75 merge in master-release history after reset to master 2014-03-06 05:49:32 -08:00
Kristian Monsen
384a2fa51a All lines can be 100 cols according to the Android style guide 
https://source.android.com/source/code-style.html
There is actually an exception that comments can have longer lines
if they a literal that is longer.

Change-Id: Iec82683c2ac1f68d08489f88bbfc924b58bc9a94
 2014-03-05 18:44:20 +00:00
The Android Automerger
f135b5d92f merge in master-release history after reset to master 2014-03-04 05:49:32 -08:00
Alan Viverette
2178063c52 Temporarily taking over API Demos v19 for Quantum demos 
v19 has been moved to v99 until we have an API rev for L release.

Change-Id: I864ef7962ce5be6f072bfe9866c9f93f12ea438e
 2014-03-03 14:08:19 -08:00
The Android Automerger
1c9601af7b merge in master-release history after reset to master 2014-03-01 05:50:00 -08:00
Tsu Chiang Chuang
3a5fd7bea4 Merge "Ensure that the native tests are run from /data/nativetest to match TF. Also cleanup a missing test from test_defs.xml" 2014-02-27 21:00:26 +00:00
George Mount
4769ecc773 Support changes in Scene Activity Transition API redo. 
This reverts commit 1b3da3748f.

Change-Id: I84fd15c154a404ed10971025b7bb33f58a344965
 2014-02-26 15:32:10 -08:00
The Android Automerger
4160261300 merge in master-release history after reset to master 2014-02-26 09:59:00 -08:00
George Mount
1b3da3748f Revert "Support changes in Scene Activity Transition API." 
This reverts commit 8ad5ffb461.

Change-Id: I3277537f7cc6a033ea1fc2948529f96c1dbc30e8
 2014-02-26 08:52:12 -08:00
George Mount
c27968847d Fix build breakage due to failed import. 
Change-Id: I626c44f30b1e899bdb230219b752511510c5bbb1
 2014-02-26 07:54:22 -08:00
Andrew Hsieh
82b184ce41 am 91925f1f: am c046b48b: Merge "Add scalbln, scalblnf, and scalblnl to x86 libm.so for API>=18" 
* commit '91925f1fe0be5fd433ab0ae09d8c640167f918c8':
  Add scalbln, scalblnf, and scalblnl to x86 libm.so for API>=18
 2014-02-26 09:51:22 +00:00
Andrew Hsieh
91925f1fe0 am c046b48b: Merge "Add scalbln, scalblnf, and scalblnl to x86 libm.so for API>=18" 
* commit 'c046b48bd6a048b5b3c020b49c778536165668e3':
  Add scalbln, scalblnf, and scalblnl to x86 libm.so for API>=18
 2014-02-26 09:45:54 +00:00
Andrew Hsieh
c046b48bd6 Merge "Add scalbln, scalblnf, and scalblnl to x86 libm.so for API>=18" 2014-02-26 09:38:25 +00:00
Andrew Hsieh
a49155bc36 Add scalbln, scalblnf, and scalblnl to x86 libm.so for API>=18 
Change-Id: Ib22eead27b8f82cfa0e1b7eb429e2c76d068120f
 2014-02-26 10:38:31 +08:00
Tsu Chiang Chuang
c137f5f1a1 Ensure that the native tests are run from /data/nativetest to match TF. 
Also cleanup a missing test from test_defs.xml

Change-Id: I9b50bd3f5c7a100a86dd550d367c8ed9a9f2bd62
 2014-02-25 17:25:10 -08:00
George Mount
7f50268c2b Merge "Support changes in Scene Activity Transition API." 2014-02-25 23:47:47 +00:00
George Mount
8ad5ffb461 Support changes in Scene Activity Transition API. 
Change-Id: Ia19b7def404f32ea5f68d2fece04dcd5ce615a42
 2014-02-25 11:12:26 -08:00
The Android Automerger
e5fc425533 merge in master-release history after reset to master 2014-02-25 05:49:23 -08:00
Adam Powell
f1a9c75865 am 93e80848: am ff08b2c1: Update Support7Demos for RecyclerView API change 
* commit '93e8084824915c4a3eb7bb4aea42a12f8137d0f2':
  Update Support7Demos for RecyclerView API change
 2014-02-25 00:32:55 +00:00
Adam Powell
93e8084824 am ff08b2c1: Update Support7Demos for RecyclerView API change 
* commit 'ff08b2c10c56a9f351d76d21f19b037324346a23':
  Update Support7Demos for RecyclerView API change
 2014-02-25 00:24:52 +00:00
Igor Murashkin
14e3c5ab59 Merge "classpath: add renderscript source directory" 2014-02-24 18:43:04 +00:00
Andrew Hsieh
e578e02876 am 8aa4464c: am fea707ac: Merge "Define __PTHREAD_*_INIT_VLAUE in pthread.h for API < 9" 
* commit '8aa4464c3ca96878be8535737745f0b82d9664ae':
  Define __PTHREAD_*_INIT_VLAUE in pthread.h for API < 9
 2014-02-24 14:32:16 +00:00
Andrew Hsieh
8aa4464c3c am fea707ac: Merge "Define __PTHREAD_*_INIT_VLAUE in pthread.h for API < 9" 
* commit 'fea707ac00967f2d3dd0df8320553eb6b8840a35':
  Define __PTHREAD_*_INIT_VLAUE in pthread.h for API < 9
 2014-02-24 14:25:29 +00:00
The Android Automerger
2e96daeba9 merge in master-release history after reset to master 2014-02-24 05:49:41 -08:00
Andrew Hsieh
fea707ac00 Merge "Define __PTHREAD_*_INIT_VLAUE in pthread.h for API < 9" 2014-02-24 09:56:21 +00:00
Andrew Hsieh
0faa78e6e0 Define __PTHREAD_*_INIT_VLAUE in pthread.h for API < 9 
Define __PTHREAD_MUTEX_INIT_VALUE, __PTHREAD_RECURSIVE_MUTEX_INIT_VALUE,
and __PTHREAD_ERRORCHECK_MUTEX_INIT_VALUE in pthread.h for API < 9.
Pthread.h in API >= 9 have those already since bionic
9831ad3ce6bd5b22da16a275ed67e7236eae3d1f

Change-Id: Ia97960ecbfed0811dde70f75cb23951ecdf803af
 2014-02-24 13:08:12 +08:00
Adam Powell
ff08b2c10c Update Support7Demos for RecyclerView API change 
LayoutManager#layoutChildren updates as well as onCreate/onBind
changes for adapters

Change-Id: I9cd1940dac8d3fd60d9219a87ae5b05c609346d6
 2014-02-21 18:39:54 -08:00
Igor Murashkin
4442be805d classpath: add renderscript source directory 
Change-Id: Ib5abe314c147bee83ef00e7203332fb3f9ee0508
 2014-02-21 10:01:08 -08:00
Andrew Hsieh
5481fd195d am 075ea66c: am a32687f4: Merge "Fix MIPS\' struct stat" 
* commit '075ea66ce7adb10431d6bfbd9c7710d140d1c4ca':
  Fix MIPS' struct stat
 2014-02-21 13:54:18 +00:00
Elliott Hughes
b93b0e5cf8 am 4683d846: am 1fe277e4: Merge "Insulate libportable from bionic changes." 
* commit '4683d8465c2b7155d0fa2db050c0a77ddb458d5e':
  Insulate libportable from bionic changes.
 2014-02-21 04:19:00 +00:00
Andrew Hsieh
075ea66ce7 am a32687f4: Merge "Fix MIPS\' struct stat" 
* commit 'a32687f493f637fc9929dda739e07021e94408b9':
  Fix MIPS' struct stat
 2014-02-21 00:06:16 +00:00
Andrew Hsieh
a32687f493 Merge "Fix MIPS' struct stat" 2014-02-20 23:58:18 +00:00
Elliott Hughes
4683d8465c am 1fe277e4: Merge "Insulate libportable from bionic changes." 
* commit '1fe277e4f991cfe6963fe362f064a68c50170532':
  Insulate libportable from bionic changes.
 2014-02-20 22:01:49 +00:00
Elliott Hughes
1fe277e4f9 Merge "Insulate libportable from bionic changes." 2014-02-20 21:55:42 +00:00
Elliott Hughes
72af45c116 Insulate libportable from bionic changes. 
Really libportable should take its own copy of BSD's <machine/asm.h>,
rather than relying on bionic's hacked-about copies.

Change-Id: I02248045a903dc4ca0d6ed1054ecb1cd54da335e
 2014-02-20 11:19:32 -08:00