Xavier Ducrohet
6ee68fe343
am 6e211383: am 459fdbce: am dcb2c538: Add annotation support lib to SDK.
...
* commit '6e21138341dde9036675737cdfa8baa76cb70c5d':
Add annotation support lib to SDK.
2014-03-26 18:23:16 +00:00
Xavier Ducrohet
459fdbcee8
am dcb2c538: Add annotation support lib to SDK.
...
* commit 'dcb2c538b88b84ba33dd2dd3a4afaab79a05608a':
Add annotation support lib to SDK.
2014-03-26 18:10:47 +00:00
Xavier Ducrohet
dcb2c538b8
Add annotation support lib to SDK.
...
Change-Id: If9faed19abc14fe6af288494c688a80789215a3b
2014-03-26 10:49:13 -07:00
Tim Kilbourn
cdb09c943e
am 56c1077d: am c9d6af6b: Merge "Add the stub src dir to the leanback extras." into klp-modular-dev
...
* commit '56c1077d131cf807563eb7b8e8bc2263f8bb1748':
Add the stub src dir to the leanback extras.
2014-03-24 19:35:16 +00:00
Tim Kilbourn
61c46959b5
Add the stub src dir to the leanback extras.
...
Change-Id: I614bcdd9f9061917fb2c4721cbe1752fd56f6c12
2014-03-18 13:36:11 -07:00
Alexander Lucas
ab05cdfb72
am dd7dda23: am 964fa100: am 7ae2eca4: am 7a80e034: Merge "Added new samples to sdk.atree for march push" into klp-docs
...
* commit 'dd7dda23a56844b706bd20c752b0696571fc582d':
Added new samples to sdk.atree for march push
2014-03-14 17:54:24 +00:00
Alexander Lucas
964fa100be
am 7ae2eca4: am 7a80e034: Merge "Added new samples to sdk.atree for march push" into klp-docs
...
* commit '7ae2eca4a0762f347e2a1981dc1becbc16a5c4bc':
Added new samples to sdk.atree for march push
2014-03-14 16:28:32 +00:00
Alexander Lucas
7ae2eca4a0
am 7a80e034: Merge "Added new samples to sdk.atree for march push" into klp-docs
...
* commit '7a80e034839e02c295cb75c59c6af75e17dad238':
Added new samples to sdk.atree for march push
2014-03-13 22:15:02 +00:00
Tim Kilbourn
957fa659c2
resolved conflicts for merge of 9eecf3fc to master
...
Change-Id: If38c80cd560d8b419420fc05a872c31b6031d90a
2014-03-12 17:27:10 -07:00
Tim Kilbourn
349ba52587
Add new support libs into the sdk build.
...
android-support-v7-recyclerview
android-support-v17-leanback
Change-Id: I6538bb30204aeaeac0b0ea34f0a5951e09f58866
2014-03-12 15:28:23 -07:00
Alexander Lucas
c4a6ecf00d
Added new samples to sdk.atree for march push
...
Change-Id: Ic138c1ff32c86ebb48375cc07d0c138829c8a3f7
2014-03-10 14:49:49 -07:00
Alexander Lucas
97c8590ca8
Updating build metadata for march sample push.
...
Change-Id: Ic8f6e2adce61c76cfb3e3c6db96f13c915be7a63
2014-03-07 15:00:38 -08:00
Steve Moyer
138d520cf7
Merging emulator smoke test projects
...
Combining SmsTest, GpsLocationTests, and ConnectivityTest
Change-Id: I7a9b8e787af37704e6af43b93f169ef90980cb2d
2014-02-20 10:26:59 -08:00
Steve Moyer
a775c5a05d
Merge "Adding SmsTest to emulator"
2014-02-11 00:42:36 +00:00
Steve Moyer
5db4928a45
Adding SmsTest to emulator
...
Change-Id: I0820ec25550debab3755db569e0e4fb6a9c62e94
2014-02-10 17:59:29 +00:00
Alexander Lucas
93ca68b5fa
am 862cb15a: am 213b633f: am b58b3103: am 47be1a3b: am fc1c6987: Updated sdk.atree to include new samples for feb sample launch
...
* commit '862cb15a018472241b93310caa0918e77f7513ac':
Updated sdk.atree to include new samples for feb sample launch
2014-02-10 12:51:40 +00:00
Alexander Lucas
b58b31037a
am 47be1a3b: am fc1c6987: Updated sdk.atree to include new samples for feb sample launch
...
* commit '47be1a3bea5be0317e8af71f202cd37e16302c76':
Updated sdk.atree to include new samples for feb sample launch
2014-02-08 18:34:51 +00:00
Alexander Lucas
fc1c69874c
Updated sdk.atree to include new samples for feb sample launch
...
Change-Id: I71af239a0bf0f146345e243720d9e4300c5ed1f6
2014-02-06 14:45:32 -08:00
Deepanshu Gupta
819f19e62f
am c6b9cf1d: am 25f6b164: am 31936361: am ce8ddf4f: am 0363ab1f: Merge "Bundle Noto fonts with the SDK" into klp-dev
...
* commit 'c6b9cf1dddff4b3c8a9574cac5efbbcc334300b3':
Bundle Noto fonts with the SDK
2014-02-06 03:29:49 +00:00
Deepanshu Gupta
319363611c
am ce8ddf4f: am 0363ab1f: Merge "Bundle Noto fonts with the SDK" into klp-dev
...
* commit 'ce8ddf4f8af5228e3d36987a8d0d5a9b030e785d':
Bundle Noto fonts with the SDK
2014-02-06 03:03:44 +00:00
Deepanshu Gupta
0363ab1f74
Merge "Bundle Noto fonts with the SDK" into klp-dev
2014-02-06 02:05:06 +00:00
Deepanshu Gupta
bc0b4a804f
Bundle Noto fonts with the SDK
...
Change-Id: I28c48b3b5dbd761ef0391497e834f315ac83cae4
2014-01-08 01:44:45 +00:00
Xavier Ducrohet
39c7e520bc
am 699fdf70: am c7e44de1: am cd171fd3: am 7f15ddd5: Properly package the RS support bc file.
...
* commit '699fdf70319ed2f5842216c0ade4118b9f236f49':
Properly package the RS support bc file.
2014-01-07 19:07:32 +00:00
Xavier Ducrohet
c7e44de196
am cd171fd3: am 7f15ddd5: Properly package the RS support bc file.
...
* commit 'cd171fd352aa8e6e1d1bc903038a81b7702f6d7a':
Properly package the RS support bc file.
2014-01-07 10:06:49 -08:00
Xavier Ducrohet
7f15ddd546
Properly package the RS support bc file.
...
Change-Id: Ia55b597085c97cb07029b812392a618a4670ff36
2014-01-02 16:24:21 -08:00
Narayan Kamath
10e8235322
am 7d3b1cc2: am 4ebf0371: am 1e18a584: Merge "Whitelist libziparchive for windows."
...
* commit '7d3b1cc2cfec31110394ef5760f39d2570f327ed':
Whitelist libziparchive for windows.
2013-12-11 21:10:02 +00:00
Narayan Kamath
4ebf03711a
am 1e18a584: Merge "Whitelist libziparchive for windows."
...
* commit '1e18a584efe16cd387c603738c47c0591532e8d9':
Whitelist libziparchive for windows.
2013-12-11 09:40:02 -08:00
Narayan Kamath
a4ea4f1843
Whitelist libziparchive for windows.
...
Change-Id: I19d527b6b52732057b16367574edc14c7065f256
2013-12-11 14:20:33 +00:00
Raphael Moll
c04b7aad0d
SDK Repository: switch to sdk addon revision 6.
...
addon-6.xsd changes <extra><revision> from an int (major only)
to a full <revision> element with major.micro.minor (but not
preview part.)
(cherry picked from commit 7657a59083
2013-11-26 14:05:47 -08:00
Alexander Lucas
a4571dc351
am 607b0da6: am f044ac48: am b734f1b5: Updating sdk.atree to reflect new set of samples
...
* commit '607b0da6372cc033eb52684fbfd425c2298984b2':
Updating sdk.atree to reflect new set of samples
2013-11-21 14:34:42 -08:00
Alexander Lucas
607b0da637
am f044ac48: am b734f1b5: Updating sdk.atree to reflect new set of samples
...
* commit 'f044ac485dd60ac075b31f81db3922b2d3780119':
Updating sdk.atree to reflect new set of samples
2013-11-21 14:30:44 -08:00
Alexander Lucas
b734f1b590
Updating sdk.atree to reflect new set of samples
...
Change-Id: I1308d65f77783fc7f43fdc36bf90a59a137ec73f
2013-11-21 13:32:25 -08:00
Maurice Chu
7b433ee4e4
Move multidex support library
...
Multidex is being moved from frameworks/support/multidex to
frameworks/multidex.
GMS Core will be using the multidex library and has gotten special
approval to use the unreleased multidex library (i.e., guinea pig).
Bug: 10674263
Change-Id: Iff895425d4d7b2278641cbe147bd35d0788cadee
2013-11-12 09:37:43 +00:00
Siva Velusamy
3f12dac94d
samples: Do not attempt to clean line endings for *.py DO NOT MERGE
...
The line endings script changes line endings, but also
removes the executable permissions of the files. We don't
want this to happen for scripts such as systrace.py
(cherry picked from commit de3fa5df07
2013-10-09 18:16:06 -07:00
Siva Velusamy
0edb7add96
am f5eea9d9: am aeccc700: am 777285ce: Merge "samples: Do not attempt to clean line endings for *.py"
...
* commit 'f5eea9d9cb35df6c20a3b807ae36633bfc71f616':
samples: Do not attempt to clean line endings for *.py
2013-10-09 15:10:19 -07:00
Siva Velusamy
f5eea9d9cb
am aeccc700: am 777285ce: Merge "samples: Do not attempt to clean line endings for *.py"
...
* commit 'aeccc7000290f3f2edc59f9ff3a941df0d37ebc3':
samples: Do not attempt to clean line endings for *.py
2013-10-09 15:07:11 -07:00
Siva Velusamy
aeccc70002
am 777285ce: Merge "samples: Do not attempt to clean line endings for *.py"
...
* commit '777285ceedba8cda5fb0fe0843fae6a887522c03':
samples: Do not attempt to clean line endings for *.py
2013-10-09 15:02:49 -07:00
Siva Velusamy
de3fa5df07
samples: Do not attempt to clean line endings for *.py
...
The line endings script changes line endings, but also
removes the executable permissions of the files. We don't
want this to happen for scripts such as systrace.py
Change-Id: I355cbc4c77cfb3c90e4615962863288680389bce
2013-10-09 09:30:08 -07:00
Raphael Moll
377d341235
am 02e906ed: am 382966f3: am 47605d10: Merge "SDK Repository: switch to sdk addon revision 6."
...
* commit '02e906edf9838a9f9a6241d861e0b8ccddc677e5':
SDK Repository: switch to sdk addon revision 6.
2013-10-01 18:45:53 -07:00
Raphael Moll
02e906edf9
am 382966f3: am 47605d10: Merge "SDK Repository: switch to sdk addon revision 6."
...
* commit '382966f30cdd800a1812d39b790cad8a04527157':
SDK Repository: switch to sdk addon revision 6.
2013-09-30 16:19:38 -07:00
Raphael Moll
382966f30c
am 47605d10: Merge "SDK Repository: switch to sdk addon revision 6."
...
* commit '47605d10f9647d21c3b350e944fe0d0f5efdc4e6':
SDK Repository: switch to sdk addon revision 6.
2013-09-30 16:15:53 -07:00
Raphael Moll
7657a59083
SDK Repository: switch to sdk addon revision 6.
...
addon-6.xsd changes <extra><revision> from an int (major only)
to a full <revision> element with major.micro.minor (but not
preview part.)
Change-Id: Ia37e75a2c8f86f4ecf36edb218f7e243f66a0b36
2013-09-30 11:57:17 -07:00
Yohann Roussel
6fa1156b3b
Add res folder to multidex SDK projects.
...
This will fix an error when importing thoses projects with ADT.
Change-Id: I75d2b0376222b13d630ef7e53386dedf62cc3fec
2013-09-12 07:51:54 +00:00
Yohann Roussel
6f57b24889
android-support-multidex-instrumentation in SDK.
...
Change-Id: I6e39034f592f6ad7654ee37970f3367a87b2034f
2013-09-11 08:05:14 +00:00
Deepanshu Gupta
4e21d52071
am a4a7f11e: am 7a63270e: am a3e0ada2: am 7c5fdf32: am 2c3e0af1: Merge "Add ICU jar to SDK" into jb-mr2-dev
...
* commit 'a4a7f11e117dec76d8a67477c99820d8bd83f3a0':
Add ICU jar to SDK
2013-09-05 12:03:43 -07:00
Deepanshu Gupta
7a63270eb4
am a3e0ada2: am 7c5fdf32: am 2c3e0af1: Merge "Add ICU jar to SDK" into jb-mr2-dev
...
* commit 'a3e0ada25bb5fbd34fe6ade783bdb61469871ab8':
Add ICU jar to SDK
2013-09-05 11:57:31 -07:00
Deepanshu Gupta
2c3e0af13c
Merge "Add ICU jar to SDK" into jb-mr2-dev
2013-09-05 18:48:10 +00:00
Yohann Roussel
a9dd9cfb71
Merge "Add multidex ADT project to SDK."
2013-09-02 11:50:41 +00:00
Mike Lockwood
cd10458c78
Add frameworks/tools to windows SDK whitelist
...
Change-Id: Id418a8784339183bd6b8f5a0abb88b877b9b4ad7
2013-08-29 08:38:13 -07:00
Yohann Roussel
a6ca3cf29f
Add multidex ADT project to SDK.
...
Change-Id: I7d622886441589002da55522ec391f19cae79da0
2013-08-22 18:34:41 +02:00
