LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,799 Commits 2 Branches 0 Tags
d0e2e93a87603b25c4d8d09db24d2819d5972cf5
Commit Graph

15799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trevor Johns
d0e2e93a87 am 8dd5fc0f: am 70c55867: am d991bed6: Resolved conflicts for merge of \'9875ec66\' into lmp-dev 
* commit '8dd5fc0f143058b3c56dbcc300f7c6f566dd5cbc':
  Add samples to sdk.atree
 2014-10-16 19:29:20 +00:00
Trevor Johns
8dd5fc0f14 am 70c55867: am d991bed6: Resolved conflicts for merge of \'9875ec66\' into lmp-dev 
* commit '70c55867bc6f30301a660331bbd28948a9ded734':
  Add samples to sdk.atree
 2014-10-16 19:16:43 +00:00
Trevor Johns
70c55867bc am d991bed6: Resolved conflicts for merge of \'9875ec66\' into lmp-dev 
* commit 'd991bed6f11b830616a967fde54f8d4f1e86eef0':
  Add samples to sdk.atree
 2014-10-16 19:00:19 +00:00
Trevor Johns
d991bed6f1 Resolved conflicts for merge of '9875ec66' into lmp-dev 
Conflicts:
	build/sdk.atree

Change-Id: Ie195fc75425ccb4ad36e3267627ae66619380505
 2014-10-15 21:16:16 -07:00
Andrew Hsieh
e730f1afff am 16385db0: am 1305bed1: am c13cf09c: Merge "Add asm/a.out.h to arm64/mips/mips64" 
* commit '16385db02a9d9a3c443ae224501a7f53fc772e23':
  Add asm/a.out.h to arm64/mips/mips64
 2014-10-16 02:38:25 +00:00
Andrew Hsieh
af3523e940 am 2cd2f260: am 0b4823b9: am 4e47988f: Merge "Remove macros putc*/getc* from API<21 stdio.h to use" 
* commit '2cd2f260747276a0f58ecd40edd5c5c3bd905ab1':
  Remove macros putc*/getc* from API<21 stdio.h to use
 2014-10-16 02:38:19 +00:00
Andrew Hsieh
183e6fbe57 am 11f8d20b: am 7a042ce4: am 9376f14e: Merge "Change sample native-codec\'s minSDK to android-21" 
* commit '11f8d20b62a49077d06d5967a42d1597d89a5e41':
  Change sample native-codec's minSDK to android-21
 2014-10-16 02:38:17 +00:00
Andrew Hsieh
16385db02a am 1305bed1: am c13cf09c: Merge "Add asm/a.out.h to arm64/mips/mips64" 
* commit '1305bed1ce59a8f5705759b6effc701c3db8fc34':
  Add asm/a.out.h to arm64/mips/mips64
 2014-10-16 02:23:50 +00:00
Andrew Hsieh
2cd2f26074 am 0b4823b9: am 4e47988f: Merge "Remove macros putc*/getc* from API<21 stdio.h to use" 
* commit '0b4823b9d6575070d8e8ff1f5e3a1fc6ef900551':
  Remove macros putc*/getc* from API<21 stdio.h to use
 2014-10-16 02:23:45 +00:00
Andrew Hsieh
11f8d20b62 am 7a042ce4: am 9376f14e: Merge "Change sample native-codec\'s minSDK to android-21" 
* commit '7a042ce40e2c4c91ac90ce1e209abe0d7cc8ab14':
  Change sample native-codec's minSDK to android-21
 2014-10-16 02:23:21 +00:00
Andrew Hsieh
1305bed1ce am c13cf09c: Merge "Add asm/a.out.h to arm64/mips/mips64" 
* commit 'c13cf09c4cab0babd7dda0f7884ae7367a40b4e9':
  Add asm/a.out.h to arm64/mips/mips64
 2014-10-16 02:00:59 +00:00
Andrew Hsieh
0b4823b9d6 am 4e47988f: Merge "Remove macros putc*/getc* from API<21 stdio.h to use" 
* commit '4e47988faed03f8ab525cc91f82213c2c9d59120':
  Remove macros putc*/getc* from API<21 stdio.h to use
 2014-10-16 02:00:58 +00:00
Andrew Hsieh
7a042ce40e am 9376f14e: Merge "Change sample native-codec\'s minSDK to android-21" 
* commit '9376f14e28cf378cc0b6354c6efa0102749acba3':
  Change sample native-codec's minSDK to android-21
 2014-10-16 02:00:57 +00:00
Andrew Hsieh
c13cf09c4c Merge "Add asm/a.out.h to arm64/mips/mips64" 2014-10-16 01:28:31 +00:00
Andrew Hsieh
4e47988fae Merge "Remove macros putc*/getc* from API<21 stdio.h to use" 2014-10-16 01:28:21 +00:00
Andrew Hsieh
9376f14e28 Merge "Change sample native-codec's minSDK to android-21" 2014-10-16 01:27:33 +00:00
Trevor Johns
9875ec66e1 am fb67b1ed: Merge "Add samples to sdk.atree" into klp-modular-docs 
* commit 'fb67b1ed063744889a74e0ff15655affa0bc5c04':
  Add samples to sdk.atree
 2014-10-16 00:29:32 +00:00
Trevor Johns
fb67b1ed06 Merge "Add samples to sdk.atree" into klp-modular-docs 2014-10-16 00:24:55 +00:00
Geoff Mendal
cdf857da09 Merge "Import translations. DO NOT MERGE" 2014-10-15 23:17:10 +00:00
Geoff Mendal
f1994d2827 Import translations. DO NOT MERGE 
Change-Id: Ic7a6e949dfa1523f233c6ad03a0347713e340923
Auto-generated-cl: translation import
 2014-10-15 16:14:10 -07:00
Tadashi G. Takaoka
c50e8c4860 am 3f6cd5d4: (-s ours) am 97f11e1c: (DO NOT MERGE) Fix sample SoftKeyboard preference activity 
* commit '3f6cd5d4ab073e0eac4eecc4a5f656b14a67599a':
  (DO NOT MERGE) Fix sample SoftKeyboard preference activity
 2014-10-15 16:39:06 +00:00
Tadashi G. Takaoka
3f6cd5d4ab am 97f11e1c: (DO NOT MERGE) Fix sample SoftKeyboard preference activity 
* commit '97f11e1c34eef659c69138d39346710f037e563f':
  (DO NOT MERGE) Fix sample SoftKeyboard preference activity
 2014-10-15 16:30:22 +00:00
Neil Fuller
48a916cc23 am b48e8788: am 29923a44: am a6e8e0d8: Merge "Remove dependencies on FloatMath" 
* commit 'b48e8788934fde9669529a3785591b32ade978cd':
  Remove dependencies on FloatMath
 2014-10-15 10:39:07 +00:00
Neil Fuller
b48e878893 am 29923a44: am a6e8e0d8: Merge "Remove dependencies on FloatMath" 
* commit '29923a44e65d97b211484f6667c3155bfc396ec9':
  Remove dependencies on FloatMath
 2014-10-15 10:34:37 +00:00
Neil Fuller
29923a44e6 am a6e8e0d8: Merge "Remove dependencies on FloatMath" 
* commit 'a6e8e0d8fbb38398884fd5c5cc0d42431070e031':
  Remove dependencies on FloatMath
 2014-10-15 10:29:59 +00:00
Neil Fuller
a6e8e0d8fb Merge "Remove dependencies on FloatMath" 2014-10-15 10:27:19 +00:00
Tadashi G. Takaoka
97f11e1c34 (DO NOT MERGE) Fix sample SoftKeyboard preference activity 
(cherry picked from Master, commit 8359ac20a5)

Bug: 17887760
Change-Id: Ibe7d1f2b9189ecee7867a2448790eddb151bd61a
 2014-10-15 09:19:12 +00:00
Andrew Hsieh
b848a811c2 am 14576ee4: am e6a62f60: am dc942b9c: Merge "Make memory_order_acquire visible in global namespace" 
* commit '14576ee4b62f5b195d6676387898363e9b32c27e':
  Make memory_order_acquire visible in global namespace
 2014-10-15 03:29:05 +00:00
Andrew Hsieh
36afc8d4ac am dcb2dcb7: am 0d879513: am 106046ae: Merge "Rename android-L to android-21" 
* commit 'dcb2dcb74522046688a2003926a38d4f2cbfa84d':
  Rename android-L to android-21
 2014-10-15 03:28:37 +00:00
Andrew Hsieh
8e41a8395b am dcebc2f1: am 93dd2f8a: am b02b4bce: Merge "Add missing function prototypes in time.h" 
* commit 'dcebc2f1d850c50c203417ee227833f3609c0c2c':
  Add missing function prototypes in time.h
 2014-10-15 03:28:21 +00:00
Andrew Hsieh
d8338a7e26 Add asm/a.out.h to arm64/mips/mips64 
The common header include/linux/a.out.h include asm/a.out.h, but
arm64/mips/mips64 don't have it.  Add a placeholder before bionic
has it

Change-Id: I7084e0beabe86fec32987a89e66d6c094f1e8c22
 2014-10-15 11:13:01 +08:00
Andrew Hsieh
14576ee4b6 am e6a62f60: am dc942b9c: Merge "Make memory_order_acquire visible in global namespace" 
* commit 'e6a62f6052e3e9b337ca9857117e751853bae6df':
  Make memory_order_acquire visible in global namespace
 2014-10-15 03:10:48 +00:00
Andrew Hsieh
c810b3ce7a Remove macros putc*/getc* from API<21 stdio.h to use 
Macros putc, getc and their unlock cousins use internal functions and
variables not necessarily available in future libc.so (*1).  Remove macros
and use functions aleady exists in libc.so instead.

(*1) https://android-review.googlesource.com/#/c/110662/

Change-Id: I3faa2d74de40ef8376119b38f2a39d46ece47d07
 2014-10-15 11:09:47 +08:00
Andrew Hsieh
e6a62f6052 am dc942b9c: Merge "Make memory_order_acquire visible in global namespace" 
* commit 'dc942b9c64fa132825e4945129339c1e954f5cfb':
  Make memory_order_acquire visible in global namespace
 2014-10-15 03:07:21 +00:00
Andrew Hsieh
dcb2dcb745 am 0d879513: am 106046ae: Merge "Rename android-L to android-21" 
* commit '0d8795135d1c5ddfcba86cf356c53b0a466e58ca':
  Rename android-L to android-21
 2014-10-15 03:07:04 +00:00
Andrew Hsieh
2437e141fe Change sample native-codec's minSDK to android-21 
android-L is renamed as android-21 in both coming SDK and NDK

Change-Id: I57b0dbe4d6e8add178dadfa6306bfc40aad27206
 2014-10-15 11:03:55 +08:00
Andrew Hsieh
0d8795135d am 106046ae: Merge "Rename android-L to android-21" 
* commit '106046ae9ef3b6a3f6659503f66338d02083d282':
  Rename android-L to android-21
 2014-10-15 03:03:17 +00:00
Andrew Hsieh
dcebc2f1d8 am 93dd2f8a: am b02b4bce: Merge "Add missing function prototypes in time.h" 
* commit '93dd2f8a29c6b30a902db4136eec465c704fe380':
  Add missing function prototypes in time.h
 2014-10-15 03:02:17 +00:00
Andrew Hsieh
dc942b9c64 Merge "Make memory_order_acquire visible in global namespace" 2014-10-15 03:01:43 +00:00
Hans Boehm
1b2269becc Make memory_order_acquire visible in global namespace 
We were missing that using directive when including <atomic>.

Bug:17736764

Change-Id: I93673dc60cca47195ff7bd651840c77255fb2d4a
 2014-10-15 11:00:28 +08:00
Andrew Hsieh
93dd2f8a29 am b02b4bce: Merge "Add missing function prototypes in time.h" 
* commit 'b02b4bced417d38f547f874b4f425270decc2e61':
  Add missing function prototypes in time.h
 2014-10-15 02:59:13 +00:00
Andrew Hsieh
106046ae9e Merge "Rename android-L to android-21" 2014-10-15 02:51:14 +00:00
Andrew Hsieh
da84168fb2 Rename android-L to android-21 
Change-Id: I1e781b15a867cf6283756f35f2b5955c96637c39
 2014-10-15 10:48:04 +08:00
Andrew Hsieh
b02b4bced4 Merge "Add missing function prototypes in time.h" 2014-10-15 02:44:06 +00:00
Haruki Hasegawa
13af1d8c37 Add missing function prototypes in time.h 
Add clock_settime() and clock_nanosleep() function
prototypes in time.h.

Change-Id: I0eb45e465b3b48b9d4f3a4a8109a6f2d9c4f8ce2
Signed-off-by: Haruki Hasegawa <h6a.h4i.0@gmail.com>
 2014-10-15 10:42:24 +08:00
Trevor Johns
9ce01dbdeb am 030c8097: am 913f8146: am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev 
* commit '030c8097527655dbbf10aa9f07d50c9975cb4ecb':
  Update sdk_repo samples 20 from 1 to 2
 2014-10-10 18:42:27 +00:00
Trevor Johns
030c809752 am 913f8146: am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev 
* commit '913f814641732ac243f823431d3dfeac2a6e646f':
  Update sdk_repo samples 20 from 1 to 2
 2014-10-10 17:00:22 +00:00
Trevor Johns
913f814641 am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev 
* commit '569e9febc5c91d92459579e32df7b948d3e32dff':
  Update sdk_repo samples 20 from 1 to 2
 2014-10-09 19:23:24 +00:00
Trevor Johns
569e9febc5 am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev 
* commit '679920d8091c0fb10e68667f158b9e18a77689fa':
  Update sdk_repo samples 20 from 1 to 2
 2014-10-09 01:24:03 +00:00
Trevor Johns
679920d809 Merge commit '3992ec56' into klp-modular-dev 
Merged with '-s ours', since the DO NOT MERGE directive from
3992ec56 wasn't properly recognized.

Change-Id: If5abab964ab49a6ce02e8da1ff67d2ee12d1b7de
 2014-10-08 17:41:47 -07:00