Elliott Hughes
d4f9f64beb
am 2cb06fc1: am a6eaa197: Merge "Remove dead code that\'s keeping other dead code in frameworks/base alive."
...
* commit '2cb06fc1f079bf089ff7dfd2844b5c0935bcc1d3':
Remove dead code that's keeping other dead code in frameworks/base alive.
2013-03-22 19:02:25 -07:00
Elliott Hughes
2cb06fc1f0
am a6eaa197: Merge "Remove dead code that\'s keeping other dead code in frameworks/base alive."
...
* commit 'a6eaa197f3f6d96696cddf5c2bf86ac628e461d8':
Remove dead code that's keeping other dead code in frameworks/base alive.
2013-03-22 18:59:48 -07:00
Elliott Hughes
a6eaa197f3
Merge "Remove dead code that's keeping other dead code in frameworks/base alive."
2013-03-23 01:40:08 +00:00
Fabrice Di Meglio
de817c95df
Fix ExpandableList1 sample
...
- also increase android:targetSdkVersion to 17
Change-Id: Ibceb38f5514a7c321f75d267e40c338c0340b1ef
2013-03-22 16:28:46 -07:00
Dianne Hackborn
29c14c31e4
am 8439ba45: Merge "Add TransportController API demo." into jb-mr2-dev
...
* commit '8439ba453656a4facae887fd6e9ebfa0e579f8b4':
Add TransportController API demo.
2013-03-22 23:23:31 +00:00
Dianne Hackborn
8439ba4536
Merge "Add TransportController API demo." into jb-mr2-dev
2013-03-22 23:17:07 +00:00
Raphael Moll
be8c3bb177
am 64f2fc34: (-s ours) am fa3fce92: (-s ours) am 7dece61e: am fbb2b119: SDK: Build/Platform-tools revision 17. DO NOT MERGE.
...
* commit '64f2fc34e889ab2bc3aea884e35144fd3c47cefb':
SDK: Build/Platform-tools revision 17. DO NOT MERGE.
2013-03-22 21:53:07 +00:00
Raphael Moll
64f2fc34e8
am fa3fce92: (-s ours) am 7dece61e: am fbb2b119: SDK: Build/Platform-tools revision 17. DO NOT MERGE.
...
* commit 'fa3fce9237c1d9641031d306242b45b979309f2c':
SDK: Build/Platform-tools revision 17. DO NOT MERGE.
2013-03-22 14:46:13 -07:00
Raphael Moll
c17ba58bec
am 9ca69cf2: SDK: Generate build-tools package.
...
* commit '9ca69cf21f1a8f35fcc472f48b3cf7be4b4b959c':
SDK: Generate build-tools package.
2013-03-22 21:46:09 +00:00
Raphael Moll
fa3fce9237
am 7dece61e: am fbb2b119: SDK: Build/Platform-tools revision 17. DO NOT MERGE.
...
* commit '7dece61ef437252062171d256c482b5b97660d68':
SDK: Build/Platform-tools revision 17. DO NOT MERGE.
2013-03-22 14:42:25 -07:00
Raphael Moll
7dece61ef4
am fbb2b119: SDK: Build/Platform-tools revision 17. DO NOT MERGE.
...
* commit 'fbb2b119dee4a84a7377e9f4f9e4facd83a6ae22':
SDK: Build/Platform-tools revision 17. DO NOT MERGE.
2013-03-22 14:40:19 -07:00
Dianne Hackborn
d2655277cd
Add TransportController API demo.
...
Change-Id: Id852ac8de1bcfbfba2d9e8557664c1aaa1e75df4
2013-03-22 14:28:52 -07:00
Raphael Moll
9ca69cf21f
SDK: Generate build-tools package.
...
(cherry-picked from bc7c8c5fc5 )
Change-Id: I36e9ee9a9486da18704428ce5225934a6a308029
2013-03-22 13:38:56 -07:00
Raphael Moll
cc7e1fe570
am a7a51a39: resolved conflicts for merge of 9583d2ed to jb-mr2-dev
...
* commit 'a7a51a397e3500b91649bb5a46e7169865151515':
SDK: Build/Platform-tools revision 17.
2013-03-22 20:09:07 +00:00
Raphael Moll
a7a51a397e
resolved conflicts for merge of 9583d2ed to jb-mr2-dev
...
Change-Id: Ib6c5f18a2b6429ef8bbca577e8cabcab26dc6ca1
2013-03-22 13:05:32 -07:00
Raphael Moll
fbb2b119de
SDK: Build/Platform-tools revision 17. DO NOT MERGE.
...
The new layout is actually a major change.
Change-Id: If2a3782ac6ed9b9c26847155443d38612c5a2122
2013-03-22 13:01:31 -07:00
Raphael Moll
9583d2ed3a
am d738f0d7: Merge "SDK: Build/Platform-tools revision 17."
...
* commit 'd738f0d746d66930074fcdbddc4cd4f134bd62a9':
SDK: Build/Platform-tools revision 17.
2013-03-22 12:57:33 -07:00
Raphael Moll
d738f0d746
Merge "SDK: Build/Platform-tools revision 17."
2013-03-22 19:44:33 +00:00
Raphael Moll
d59536eae6
SDK: Build/Platform-tools revision 17.
...
The new layout is actually a major change.
Change-Id: I835fa68db78cd1843254154466f61f48bf6d71d0
2013-03-22 11:18:05 -07:00
Raphael Moll
493df83686
am 11ad495f: am 205d337b: am 6d1249e6: Merge "SDK: Generate build-tools package."
...
* commit '11ad495f11f17a1f2912e0c9e4b915ae5ad6cce9':
SDK: Generate build-tools package.
2013-03-22 18:17:53 +00:00
Raphael Moll
e0ed15a247
am 8a8a3025: resolved conflicts for merge of c6dc2830 to jb-mr2-dev
...
* commit '8a8a3025bb570a8ea526e6754bc680dc7f015140':
SDK: Place platform-tools NOTICE file in proper directory.
2013-03-22 18:14:25 +00:00
Raphael Moll
11ad495f11
am 205d337b: am 6d1249e6: Merge "SDK: Generate build-tools package."
...
* commit '205d337b9db27ef87b2849bef0ac092b3200cb1e':
SDK: Generate build-tools package.
2013-03-22 11:11:36 -07:00
Raphael Moll
8a8a3025bb
resolved conflicts for merge of c6dc2830 to jb-mr2-dev
...
Change-Id: Ia4e83de02c3f6d04523f52ca9586bdb217d9084c
2013-03-22 11:09:16 -07:00
Raphael Moll
205d337b9d
am 6d1249e6: Merge "SDK: Generate build-tools package."
...
* commit '6d1249e62678c12f3cac62c7104db52b3a415dd1':
SDK: Generate build-tools package.
2013-03-22 11:03:12 -07:00
Raphael Moll
c6dc283043
am 8e9aa76f: am ef196297: SDK: Place platform-tools NOTICE file in proper directory.
...
* commit '8e9aa76f513c16243a08bb7f3806f4dbc8477ad6':
SDK: Place platform-tools NOTICE file in proper directory.
2013-03-22 10:54:48 -07:00
Raphael Moll
8e9aa76f51
am ef196297: SDK: Place platform-tools NOTICE file in proper directory.
...
* commit 'ef1962972fca71034a63181a04c1ce71be855273':
SDK: Place platform-tools NOTICE file in proper directory.
2013-03-22 10:51:57 -07:00
Raphael Moll
6d1249e626
Merge "SDK: Generate build-tools package."
2013-03-22 17:50:39 +00:00
Raphael Moll
ef1962972f
SDK: Place platform-tools NOTICE file in proper directory.
...
Change-Id: Id5177504b30599df7f44b2354fb708515cfb54a9
2013-03-22 10:30:50 -07:00
Raphael Moll
bc7c8c5fc5
SDK: Generate build-tools package.
...
Change-Id: I36e9ee9a9486da18704428ce5225934a6a308029
2013-03-22 10:29:15 -07:00
Scott Main
d49fbdbcc1
add support library JAR to sample
...
Change-Id: I15c30e19606a0b3415d5883bced4c2f56fd703fa
2013-03-22 09:53:15 -07:00
Raphael Moll
ee07ed2c39
am 3f5b02ec: (-s ours) am 8d894a70: (-s ours) am 98013c6f: am cc8a21a2: SDK: Generate build-tools package. DO NOT MERGE.
...
* commit '3f5b02ec32d57716d6499805a0acab79f8e38277':
SDK: Generate build-tools package. DO NOT MERGE.
2013-03-22 04:05:02 +00:00
Raphael Moll
3f5b02ec32
am 8d894a70: (-s ours) am 98013c6f: am cc8a21a2: SDK: Generate build-tools package. DO NOT MERGE.
...
* commit '8d894a705a33ad14e4f650a07d6bbd7e10752d81':
SDK: Generate build-tools package. DO NOT MERGE.
2013-03-21 21:02:58 -07:00
Raphael Moll
8d894a705a
am 98013c6f: am cc8a21a2: SDK: Generate build-tools package. DO NOT MERGE.
...
* commit '98013c6f47475f0990eb135353fd8f9107267e73':
SDK: Generate build-tools package. DO NOT MERGE.
2013-03-21 21:00:16 -07:00
Raphael Moll
98013c6f47
am cc8a21a2: SDK: Generate build-tools package. DO NOT MERGE.
...
* commit 'cc8a21a276ec3c0d4f7c3a09809971f6924f1d0f':
SDK: Generate build-tools package. DO NOT MERGE.
2013-03-21 20:57:59 -07:00
Jeff Brown
9873fc442b
am 34fd8af6: Add support library SDK dependency.
...
* commit '34fd8af67c4983e092ab880134d010d2c896d204':
Add support library SDK dependency.
2013-03-21 02:10:09 +00:00
Jeff Brown
36abf47fc2
am 84e6be0c: Add action bar support library samples.
...
* commit '84e6be0c6922da32a7d4f8b732ef56b97f8d8560':
Add action bar support library samples.
2013-03-21 02:10:09 +00:00
Jeff Brown
f1068edf70
am 63c90a55: Add grid layout support library samples.
...
* commit '63c90a5512fa5427d924fa2ae21a386d9c2845dc':
Add grid layout support library samples.
2013-03-21 02:10:08 +00:00
Jeff Brown
0c3be55feb
am bda0c731: Move media router samples to new Support7Demos project.
...
* commit 'bda0c731681aae85372f33910237a9870cefb48f':
Move media router samples to new Support7Demos project.
2013-03-21 02:10:07 +00:00
Jeff Brown
988e2e8072
am 3221bcdb: Update appcompat support lib atree rules.
...
* commit '3221bcdb88a62d6caa89a2ec43d969b6c2c1f3f7':
Update appcompat support lib atree rules.
2013-03-21 02:10:06 +00:00
Jeff Brown
43db4bb8c3
am a00f2f6e: Update gridlayout support library atree rules.
...
* commit 'a00f2f6eb8e0638250afb7bff83212b18cd4c9c2':
Update gridlayout support library atree rules.
2013-03-21 02:10:05 +00:00
Jeff Brown
34fd8af67c
Add support library SDK dependency.
...
Bug: 8175766
Change-Id: I327a7d0b57a37fb2fbdb11ab44b1a09832b56863
2013-03-20 18:56:58 -07:00
Jeff Brown
84e6be0c69
Add action bar support library samples.
...
These samples are simply ported from the ApiDemos package
with package names updated to use the support library
implementation instead.
Bug: 8175766
Change-Id: Idfa35708d4db65a201a20c3726bb18663c2c0a81
2013-03-20 18:20:18 -07:00
Jeff Brown
63c90a5512
Add grid layout support library samples.
...
These samples are simply ported from the ApiDemos package
with package names updated to use the support library
implementation instead.
Bug: 8175766
Change-Id: Ib24c1250ed7571353f606422734a4660f382b368
2013-03-20 18:20:18 -07:00
Jeff Brown
bda0c73168
Move media router samples to new Support7Demos project.
...
Add media router support library to SDK build.
Bug: 8175766
Change-Id: I2f333d40ad39e820e8d706a7dab086241692a861
2013-03-20 18:20:18 -07:00
Jeff Brown
3221bcdb88
Update appcompat support lib atree rules.
...
Bug: 8175766
Change-Id: I553d24844e3f85313207c2c2d64336ee6a5c9a17
2013-03-20 18:20:18 -07:00
Jeff Brown
a00f2f6eb8
Update gridlayout support library atree rules.
...
Bug: 8175766
Change-Id: Ia2e2faeff2540cc2879e93f11d082fe47ae1de8f
2013-03-20 18:20:18 -07:00
Raphael Moll
cc8a21a276
SDK: Generate build-tools package. DO NOT MERGE.
...
Change-Id: I6ae3757f947e927ea09b637e552834e17f70dc44
2013-03-20 16:43:47 -07:00
Andrew Hsieh
5cceff59a2
am 1b871ef1: am 9b813396: am 4d49f477: Merge "Fix build >= JB"
...
* commit '1b871ef1c46afea0307e813da8b37b046c97b6d8':
Fix build >= JB
2013-03-20 19:22:59 +00:00
Andrew Hsieh
1b871ef1c4
am 9b813396: am 4d49f477: Merge "Fix build >= JB"
...
* commit '9b8133966ac16c11033200edf0a1c717a2bfcb9e':
Fix build >= JB
2013-03-20 12:18:16 -07:00
Andrew Hsieh
9b8133966a
am 4d49f477: Merge "Fix build >= JB"
...
* commit '4d49f477fcf14f82f6c588dd7afc5b5c3beaea18':
Fix build >= JB
2013-03-20 12:15:46 -07:00