Trevor Johns
4a71ff571d
am ee811814: Update sdk.atree with new samples for LMP Preview release
...
* commit 'ee8118144402226bb3fda9c78a27de43140e92ad':
Update sdk.atree with new samples for LMP Preview release
2014-06-20 19:14:22 +00:00
Trevor Johns
ee81181444
Update sdk.atree with new samples for LMP Preview release
...
Change-Id: I6bbafb05b39ee448bbe8f831bbbb58e364851c79
2014-06-19 23:57:19 -07:00
Xavier Ducrohet
e263f439b6
am 0f0b786b: Move sqlite3 to platform-tools.
...
* commit '0f0b786b5af31a7794eacc66eedb252d72490d86':
Move sqlite3 to platform-tools.
2014-06-18 03:33:24 +00:00
Xavier Ducrohet
0f0b786b5a
Move sqlite3 to platform-tools.
...
This was in the SDK tools before but it's really part of
the platform.
Change-Id: I2a88d288aec6fd1556a28db58976fc1c889efd35
2014-06-17 20:25:57 -07:00
Xavier Ducrohet
c5e962866b
am 9a258bce: Revert "Revert "Add cardview to support extra package.""
...
* commit '9a258bce2cc829e3e80acc4680d7c7fb361f1435':
Revert "Revert "Add cardview to support extra package.""
2014-06-18 00:42:39 +00:00
Xavier Ducrohet
de91aa6a87
am fffa1541: Revert "Add cardview to support extra package."
...
* commit 'fffa1541f10acef428b9b370b4b78b55c72fa306':
Revert "Add cardview to support extra package."
2014-06-17 23:15:15 +00:00
Xavier Ducrohet
9a258bce2c
Revert "Revert "Add cardview to support extra package.""
...
Also add cardview to the list of support lib in
build/Android.mk
This reverts commit fffa1541f1
2014-06-17 16:14:47 -07:00
Xavier Ducrohet
fffa1541f1
Revert "Add cardview to support extra package."
...
This reverts commit 1e396a5975
2014-06-17 16:09:48 -07:00
Xavier Ducrohet
af91cc72df
am 1e396a59: Add cardview to support extra package.
...
* commit '1e396a59756dd9900d1cacb14c1cd07ac4901453':
Add cardview to support extra package.
2014-06-17 19:21:50 +00:00
Xavier Ducrohet
1e396a5975
Add cardview to support extra package.
...
Change-Id: I796857c19ff466d0d84b9c9901273068510c3fb6
2014-06-17 12:12:16 -07:00
Deepanshu Gupta
9e66bc405f
am f7449cdb: Merge "Package renamed fonts again." into lmp-preview-dev
...
* commit 'f7449cdb18aeef440c8b1e2d7e99ec9970fc7f8a':
Package renamed fonts again.
2014-06-12 16:54:21 +00:00
Raphael Moll
b6fbb4d0c9
am 9cec99d9: am ea21b816: am 28748be7: Merge "Generate api-versions.xml for lint."
...
* commit '9cec99d9540822e68559e25b471bbe788352839d':
Generate api-versions.xml for lint.
2014-06-11 18:18:59 +00:00
Deepanshu Gupta
4100ca144d
Package renamed fonts again.
...
PS names of fonts are renamed to include the version number. This change
packages the fonts from the output directory of the script that modifies
the fonts.
Change-Id: I023fb0dfcf50698f80e26b7d476969c453fc4cc7
2014-06-10 18:42:40 -07:00
Chris Banes
e6174a6e97
Merge "DO NOT MERGE Add android-support-v7-palette to build" into lmp-preview-dev
2014-06-11 15:57:38 +00:00
Chris Banes
34d8ff4c6a
DO NOT MERGE Add android-support-v7-palette to build
...
Change-Id: I22cec92b976645d766441b140a5d5754c4ebbe46
(cherry picked from commit 8028b39252
2014-06-10 14:00:04 +00:00
Raphael Moll
9cec99d954
am ea21b816: am 28748be7: Merge "Generate api-versions.xml for lint."
...
* commit 'ea21b8169062fecf0bf32abafc5892ad3beb8238':
Generate api-versions.xml for lint.
2014-06-09 23:52:02 +00:00
Raphael Moll
ea21b81690
am 28748be7: Merge "Generate api-versions.xml for lint."
...
* commit '28748be7e5a95ca32fd4b930be05ad4bdd365a43':
Generate api-versions.xml for lint.
2014-06-09 23:49:42 +00:00
Raphael Moll
4f8a38ed7a
Generate api-versions.xml for lint.
...
Depends on:
- tools/base I747d27e998c6dbd61dd17c44bfc747c9542e33d1
- tools/buildSrc I400f4b6c146836ba30e6e7985ca6c9894985a8cb
- prebuilts/tools Ia4b0c477cf6f4788de610be017a9f5b43d73486c
Change-Id: I3f791d5e1d0ea893cdb5969854d9ae99d5fbb5b7
2014-06-09 15:59:58 -07:00
Erik Pasternak
a4a83ccba1
am 0b7a8dbd: Merge "Revert "Package renamed fonts."" into lmp-preview-dev
...
* commit '0b7a8dbde8b006aef349f75f4837b7f1c9e498fd':
Revert "Package renamed fonts."
2014-06-09 15:55:46 +00:00
Deepanshu Gupta
177e561e40
am cde7418e: Merge "Package renamed fonts." into lmp-preview-dev
...
* commit 'cde7418ead103db609dbee8e43b2b91992f3a74a':
Package renamed fonts.
2014-06-09 15:55:27 +00:00
Erik Pasternak
cdee35f788
Revert "Package renamed fonts."
...
This change broke the SDK builds.
This reverts commit ef43acc413
2014-06-08 19:30:44 +00:00
Steve Moyer
23a8adf276
DO NOT MERGE: Add SmsTest and mege emulator smoke tests
...
Picked Changes:
Add SMS test to verify emulator can receive sms from DDMS
Adding test tag to sms test
Add up to 6 10 second delays to wait for sms
Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest
Conflicts:
build/sdk.atree
Change-Id: I1343c59418a69b2f5e1eb0c6cde54f2bc09300ac
2014-06-04 09:55:31 -07:00
Raphael Moll
32b5e338b5
am 95a5c56c: am 728f321c: Merge "Add Build-Tools runtime.properties file."
...
* commit '95a5c56c8f6d87bb9a3c4d08b94c13c409c6ea74':
Add Build-Tools runtime.properties file.
2014-06-04 12:28:41 +00:00
Raphael Moll
95a5c56c8f
am 728f321c: Merge "Add Build-Tools runtime.properties file."
...
* commit '728f321cb94220e1f7d1d72759b6c6b342152c15':
Add Build-Tools runtime.properties file.
2014-06-04 09:55:53 +00:00
Raphael Moll
37433ac223
Add Build-Tools runtime.properties file.
...
Change-Id: I5addf44a2ea3dbb91df5a49f6fcb10e75047fa82
2014-06-03 13:46:51 -07:00
Deepanshu Gupta
ef43acc413
Package renamed fonts.
...
PS names of fonts are renamed to include the version number. This change
packages the fonts from the output directory of the script that modifies
the fonts.
Change-Id: Iac2a34475b095ed38f8706420acda40c5d53364b
2014-05-30 10:38:45 -07:00
Chris Banes
8028b39252
Add android-support-v7-palette to build
...
Change-Id: I22cec92b976645d766441b140a5d5754c4ebbe46
2014-05-30 10:17:46 +00:00
Raphael Moll
6f2b614418
am f7863319: am 261307be: resolved conflicts for merge of bf164835 to stage-aosp-master
...
* commit 'f786331925d50c2235f298e39880a9a05670b0dd':
Fix SDK build.
2014-05-21 00:01:29 +00:00
Raphael Moll
f786331925
am 261307be: resolved conflicts for merge of bf164835 to stage-aosp-master
...
* commit '261307bebe8986599055bb97d5587977c8da53eb':
Fix SDK build.
2014-05-20 23:35:46 +00:00
Raphael Moll
261307bebe
resolved conflicts for merge of bf164835 to stage-aosp-master
...
Change-Id: I3c380b1ddae5e088985513398d7eb6274d8426eb
2014-05-20 16:29:29 -07:00
Raphael Moll
e9a7920ca4
Fix SDK build.
...
development's sdk.atree depends on the generated file
/sdk/files/sdk_files_NOTICE.txt which was accumulating
all the tools notices.
However this file isn't generated anymore.
This replaces it by a static file.
This is only good as a temporary measure to fix the build.
The proper fix is to recreate the SDK rule to generate the
combined NOTICE.txt and move it in development.git
Change-Id: I27e4f38e756b81b002d16dfac5ccaa54a4463786
2014-05-20 14:10:47 -07:00
Evan Charlton
10163e76fc
am 311e3662: Merge "Merging emulator smoke test projects" into master-nova
...
* commit '311e3662bdaec82c621fd3b04c4505ce60d2df15':
Merging emulator smoke test projects
2014-05-13 15:19:06 +00:00
Baligh Uddin
31078f7fbd
am 3b842a86: keep history after reset to master-nova-dev
...
* commit '3b842a8628da809286b810b6881e382890ead1f6':
2014-05-13 15:18:49 +00:00
Bill Yi
23f68632c7
Merge commit 'd297be2136209cab4edbcf8879520f65fb564103' into HEAD
2014-04-29 11:33:09 -07:00
Alexander Lucas
b9581d5aae
am 229d4df3: am 5bf3d523: am fd5ede91: am f5d4c15b: Added swipe-to-refresh samples to sdk.atree
...
* commit '229d4df318a4adc0fae28989b8cb0ca277a2f201':
Added swipe-to-refresh samples to sdk.atree
2014-04-11 23:01:16 +00:00
Alexander Lucas
5bf3d5236c
am fd5ede91: am f5d4c15b: Added swipe-to-refresh samples to sdk.atree
...
* commit 'fd5ede91e7900da3bbc20b9ef0ca3859ec499e01':
Added swipe-to-refresh samples to sdk.atree
2014-04-11 22:31:42 +00:00
Alexander Lucas
f5d4c15b0b
Added swipe-to-refresh samples to sdk.atree
...
Change-Id: If939f14e90c04d2df8bbe683812d2f01ef5f3399
2014-04-11 15:20:55 -07:00
Alexander Lucas
b015fd0ff0
am b020e934: am ad5f0e86: am eb72a600: am 4a25165a: Merge "Updated Samples metadata for April push of samples" into klp-docs
...
* commit 'b020e934c5584706d7edfa0c0fe24f69f6a6d38b':
Updated Samples metadata for April push of samples
2014-04-11 20:36:08 +00:00
Alexander Lucas
ad5f0e867b
am eb72a600: am 4a25165a: Merge "Updated Samples metadata for April push of samples" into klp-docs
...
* commit 'eb72a6002c8ebdeeb94e432dadc828d7d158cbf2':
Updated Samples metadata for April push of samples
2014-04-11 20:29:54 +00:00
Alexander Lucas
c7ad654960
Updated Samples metadata for April push of samples
...
Change-Id: Ie4136c1cb9051bead3c73a93ccf646577d721a50
2014-04-11 13:21:11 -07:00
Xavier Ducrohet
f3ff0296c9
Move ZipAlign to build-tools. DO NOT MERGE.
...
(cherry picked from commit 76510e2dd2
2014-04-04 10:45:35 -07:00
Steve Moyer
0b1a1f7b38
Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests"
2014-04-04 16:32:00 +00:00
Xavier Ducrohet
8821b239d1
am d6ccbcd2: am 47eadf1e: Merge "Move ZipAlign to build-tools."
...
* commit 'd6ccbcd253d34feb75cba4cbd98f520dfa789757':
Move ZipAlign to build-tools.
2014-04-04 03:19:02 +00:00
Xavier Ducrohet
d6ccbcd253
am 47eadf1e: Merge "Move ZipAlign to build-tools."
...
* commit '47eadf1ecef5e898d63863edaa644615942ad0fd':
Move ZipAlign to build-tools.
2014-04-04 00:08:23 +00:00
Steve Moyer
6ded79d696
DO NOT MERGE: Add SmsTest and mege emulator smoke tests
...
Picked Changes:
Add SMS test to verify emulator can receive sms from DDMS
Adding test tag to sms test
Add up to 6 10 second delays to wait for sms
Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest
Conflicts:
build/sdk.atree
Change-Id: I1343c59418a69b2f5e1eb0c6cde54f2bc09300ac
2014-04-03 16:02:56 -07:00
Xavier Ducrohet
76510e2dd2
Move ZipAlign to build-tools.
...
Change-Id: Id83a8dc86946bcde78e9eaaab009a06a59fccbd0
2014-04-03 10:09:53 -07:00
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
