Baligh Uddin
3bef59abfc
am 3a39d4e2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '3a39d4e245e39dc0cfad953ef38a11035e69a6c9':
Import translations. DO NOT MERGE
2014-10-20 00:22:00 +00:00
Baligh Uddin
3a39d4e245
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-10-20 00:16:42 +00:00
Baligh Uddin
c6fcd869c6
Import translations. DO NOT MERGE
...
Change-Id: I1114bea9e5f859734d8058b7344b9122c8dad7a7
Auto-generated-cl: translation import
2014-10-19 16:01:45 -07:00
Baligh Uddin
dc4b7e3dc0
am 3afda098: (-s ours) am bb11b4a9: (-s ours) am 568808dd: (-s ours) am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE
...
* commit '3afda098e1f47d3b6225086ed9add32bc8bfd819':
Import translations. DO NOT MERGE
2014-10-19 17:11:25 +00:00
Baligh Uddin
3afda098e1
am bb11b4a9: (-s ours) am 568808dd: (-s ours) am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE
...
* commit 'bb11b4a90a394a7c67fec2a687ab248b5bcc518b':
Import translations. DO NOT MERGE
2014-10-19 17:06:49 +00:00
Baligh Uddin
bb11b4a90a
am 568808dd: (-s ours) am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE
...
* commit '568808dd397b8951ad5b525b5ad7f4471f47c4eb':
Import translations. DO NOT MERGE
2014-10-19 17:01:27 +00:00
Baligh Uddin
568808dd39
am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE
...
* commit '0a77b1e924a62097723f4ebe862fa4274c9fa7fe':
Import translations. DO NOT MERGE
2014-10-19 16:56:39 +00:00
Baligh Uddin
d5c6c1cdf7
am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE
...
* commit '0a77b1e924a62097723f4ebe862fa4274c9fa7fe':
Import translations. DO NOT MERGE
2014-10-19 16:55:05 +00:00
Baligh Uddin
0a77b1e924
Import translations. DO NOT MERGE
...
Change-Id: Id9d8758cb68860dad84005bd5a29649b287652ea
Auto-generated-cl: translation import
2014-10-19 09:47:23 -07:00
Xavier Ducrohet
9756546087
am 297089b1: am 946bfb51: Update Build Tools version to <API>.0.1. DO NOT MERGE.
...
* commit '297089b18ed58c1b297767256b9d2a15d370b51f':
Update Build Tools version to <API>.0.1. DO NOT MERGE.
2014-10-17 23:12:30 +00:00
Xavier Ducrohet
297089b18e
am 946bfb51: Update Build Tools version to <API>.0.1. DO NOT MERGE.
...
* commit '946bfb51c0c4e47c9d111ada1fddf050e2823609':
Update Build Tools version to <API>.0.1. DO NOT MERGE.
2014-10-17 23:01:45 +00:00
Xavier Ducrohet
f2dcbd2e72
am 946bfb51: Update Build Tools version to <API>.0.1. DO NOT MERGE.
...
* commit '946bfb51c0c4e47c9d111ada1fddf050e2823609':
Update Build Tools version to <API>.0.1. DO NOT MERGE.
2014-10-17 22:55:26 +00:00
Xavier Ducrohet
946bfb51c0
Update Build Tools version to <API>.0.1. DO NOT MERGE.
...
This for the release that fixes the aapt crash on windows.
Change-Id: I983a5f084d6786bd0a8c0676b64001d7be6aa3d3
2014-10-17 15:48:37 -07:00
Trevor Johns
4b16c84fb0
am c60b2dd6: am 36274ac5: Add additional samples for L to sdk.atree
...
* commit 'c60b2dd6b5982029b7115da777a1e1eefb2bab53':
Add additional samples for L to sdk.atree
2014-10-17 20:28:51 +00:00
Trevor Johns
f70fdf3c80
sdk.atree: Move JobScheduler sample from 'ui/views' to 'background'
...
Change-Id: Ibecdf48a2977ce52b198d626947ba71eba1ad2b9
2014-10-17 12:58:03 -07:00
Trevor Johns
c60b2dd6b5
am 36274ac5: Add additional samples for L to sdk.atree
...
* commit '36274ac53dfcef9661c5215e9fabf7a6501e0c64':
Add additional samples for L to sdk.atree
2014-10-17 19:56:44 +00:00
Trevor Johns
cc763b72d5
am 36274ac5: Add additional samples for L to sdk.atree
...
* commit '36274ac53dfcef9661c5215e9fabf7a6501e0c64':
Add additional samples for L to sdk.atree
2014-10-17 19:27:19 +00:00
Trevor Johns
34ebd03fbc
am 4b5d8355: am 6876a9cf: Add browseable samples for L SDK release
...
* commit '4b5d8355cb61a6420d6a218396650e7b4c4ac88b':
Add browseable samples for L SDK release
2014-10-17 19:17:20 +00:00
Trevor Johns
84f0d412b6
am 4e09738a: am 66b6f721: Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev
...
* commit '4e09738a8684cf2ba5ed111764d7804ada2a4298':
Update sdk.atree and samples_source.prop_template for L SDK release
2014-10-17 19:17:17 +00:00
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
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
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
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