Lai Wei-Chih
521bcfb17a
[libportable] Add fenv support.
...
Fix ndk/tests/device/fenv.
Change-Id: I46e1b47c3bec5213e827fabe311ef9e29a28195b
2013-03-26 22:09:17 +08:00
Jeff Sharkey
29045946c0
Remove reference to <root-path>.
...
Bug: 8409523
Change-Id: I42834e33d0d664977dca9277ae364d2cf8986d07
2013-03-25 16:16:51 -07:00
Fabrice Di Meglio
6610dd0f62
am e7b90faf: Merge "Fix ExpandableList1 sample" into jb-mr2-dev
...
* commit 'e7b90faf8f04d7832d3932243a977f2d4d1381e9':
Fix ExpandableList1 sample
2013-03-25 21:27:38 +00:00
Fabrice Di Meglio
e7b90faf8f
Merge "Fix ExpandableList1 sample" into jb-mr2-dev
2013-03-25 21:20:25 +00:00
Chris Banes
0c7ad923ee
am 0014f87c: Merge "Fixes AppCompat build location" into jb-mr2-dev
...
* commit '0014f87c54890cb21ade6162caf5ff63f6805d28':
Fixes AppCompat build location
2013-03-25 20:49:06 +00:00
Chris Banes
0014f87c54
Merge "Fixes AppCompat build location" into jb-mr2-dev
2013-03-25 20:42:07 +00:00
Scott Main
5ece9d3499
am 8e2b7c5d: am e92f6467: am 35964ea6: am 449326f1: am d49fbdbc: add support library JAR to sample
...
* commit '8e2b7c5d3fd1be5aaf7a818b31ef51afff129f68':
add support library JAR to sample
2013-03-25 16:05:49 +00:00
Scott Main
8e2b7c5d3f
am e92f6467: am 35964ea6: am 449326f1: am d49fbdbc: add support library JAR to sample
...
* commit 'e92f6467d0c85c7f2f8f5f5dc1dbfb8695f8c545':
add support library JAR to sample
2013-03-25 09:02:54 -07:00
Scott Main
e92f6467d0
am 35964ea6: am 449326f1: am d49fbdbc: add support library JAR to sample
...
* commit '35964ea619381ed65aa04ea2e5071ebaa1b56f92':
add support library JAR to sample
2013-03-25 09:00:26 -07:00
Scott Main
35964ea619
am 449326f1: am d49fbdbc: add support library JAR to sample
...
* commit '449326f1a88f92a1aebe7233b0ee66b02d0e1e67':
add support library JAR to sample
2013-03-25 08:58:14 -07:00
Scott Main
449326f1a8
am d49fbdbc: add support library JAR to sample
...
* commit 'd49fbdbcc12de0b4364beaefece82242f1520806':
add support library JAR to sample
2013-03-25 08:56:27 -07:00
Chris Banes
063f035dd8
Fixes AppCompat build location
...
Fixes the appcompat build so that the resulting
lib is with the library project.
Change-Id: I9d7c79bc1b7c9e4d0b894d5c9ce2f7e5e901184b
Signed-off-by: Chris Banes <chrisbanes@google.com >
2013-03-25 09:34:53 +00:00
Jeff Brown
fac1b79572
am fbe0890b: Rename methods of RouteController.
...
* commit 'fbe0890bb4830a27490dbfb664e3a6215f3e523e':
Rename methods of RouteController.
2013-03-23 02:57:12 +00:00
Jeff Brown
fbe0890bb4
Rename methods of RouteController.
...
Add basic support for returning stream ids.
Change-Id: Iaa11980e6195e23bd598075cb066c6234f000198
2013-03-22 19:46:23 -07:00
Elliott Hughes
19fd8ce030
am d4f9f64b: am 2cb06fc1: am a6eaa197: Merge "Remove dead code that\'s keeping other dead code in frameworks/base alive."
...
* commit 'd4f9f64bebe16f1d08d07843a13fd25b62eb6777':
Remove dead code that's keeping other dead code in frameworks/base alive.
2013-03-23 02:06:46 +00:00
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