Trevor Johns
339006dcbd
am 72687bd8: am ca8bc22a: sdk.atree: Fix typo and remove legacy BluetoothChat sample
...
* commit '72687bd8a7d3629b2ceb3a9fa1cefcd4bbdf4d66':
sdk.atree: Fix typo and remove legacy BluetoothChat sample
2014-10-17 19:17:11 +00:00
Trevor Johns
36274ac53d
Add additional samples for L to sdk.atree
...
- RecyclerView
- CardView
- LNotifications
- DrawableTinting
- InterpolatorPlayground
- PdfRendererBasic
- FloatingActionButtonBasic
- RevealEffectBasic
Change-Id: Icea2e207311d60ad72c349c3a6a17439526661af
2014-10-17 12:05:30 -07:00
Trevor Johns
4b5d8355cb
am 6876a9cf: Add browseable samples for L SDK release
...
* commit '6876a9cfc5eb05168ae7fa5215979f22396fff58':
Add browseable samples for L SDK release
2014-10-17 18:53:07 +00:00
Trevor Johns
4e09738a86
am 66b6f721: Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev
...
* commit '66b6f721b7e20911f0764720346caca5c77fb22b':
Update sdk.atree and samples_source.prop_template for L SDK release
2014-10-17 18:50:56 +00:00
Trevor Johns
72687bd8a7
am ca8bc22a: sdk.atree: Fix typo and remove legacy BluetoothChat sample
...
* commit 'ca8bc22a50c47517e7731a1762ffe39e105462b5':
sdk.atree: Fix typo and remove legacy BluetoothChat sample
2014-10-17 18:50:55 +00:00
Trevor Johns
de236d16d0
am 6876a9cf: Add browseable samples for L SDK release
...
* commit '6876a9cfc5eb05168ae7fa5215979f22396fff58':
Add browseable samples for L SDK release
2014-10-17 15:10:50 +00:00
Trevor Johns
6876a9cfc5
Add browseable samples for L SDK release
...
Change-Id: I71c6ff9a90b7734042d68af7f01e6d61118cc508
2014-10-17 03:31:00 -07:00
Trevor Johns
e3e839e52b
am 66b6f721: Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev
...
* commit '66b6f721b7e20911f0764720346caca5c77fb22b':
Update sdk.atree and samples_source.prop_template for L SDK release
2014-10-17 07:26:28 +00:00
Trevor Johns
8176b9067f
am ca8bc22a: sdk.atree: Fix typo and remove legacy BluetoothChat sample
...
* commit 'ca8bc22a50c47517e7731a1762ffe39e105462b5':
sdk.atree: Fix typo and remove legacy BluetoothChat sample
2014-10-17 07:25:21 +00:00
Trevor Johns
66b6f721b7
Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev
2014-10-17 00:22:31 +00:00
Trevor Johns
b21dca0c15
Update sdk.atree and samples_source.prop_template for L SDK release
...
- Add new samples to sdk.atree
- Bump revision for samples_source.prop_template
Change-Id: I592d2457502dbd2458dec7879c5cea7320743378
2014-10-16 17:20:10 -07:00
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
3beb9eae9a
am d991bed6: Resolved conflicts for merge of \'9875ec66\' into lmp-dev
...
* commit 'd991bed6f11b830616a967fde54f8d4f1e86eef0':
Add samples to sdk.atree
2014-10-16 18:18:22 +00:00
Trevor Johns
ca8bc22a50
sdk.atree: Fix typo and remove legacy BluetoothChat sample
...
- Fixed typo: Renamed "MediaEffect" sample to "MediaEffects"
- Removed legacy BluetoothChat sample, since the templatized version
has now been checked in.
Change-Id: I1b5e48f41a3daa171d70bac765cfba2ece9dd088
2014-10-16 00:03:51 -07: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
d10b06ebe3
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:42 +00:00
Andrew Hsieh
10efbc1461
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:41 +00:00
Andrew Hsieh
2f5539a4eb
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:26 +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
29329726c3
am 29923a44: am a6e8e0d8: Merge "Remove dependencies on FloatMath"
...
* commit '29923a44e65d97b211484f6667c3155bfc396ec9':
Remove dependencies on FloatMath
2014-10-15 10:34:45 +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
d6bf7265b3
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:51 +00: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