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
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
Andrew Hsieh
4d49f477fc
Merge "Fix build >= JB"
2013-03-20 18:55:45 +00:00
Andrew Hsieh
2f6ae26a67
Fix build >= JB
...
File arch-mips/sigsetjmp.S includes <asm-generic/portability.h>
already defined in LOCAL_CFLAGS, and build system prior JB
passes LOCAL_CFLAGS for building *.S as well, but no more >=JB.
Use LOCAL_C_INCLUDES instead (pass for *.S too)
Change-Id: I7e6d6e838d632f980aa6c9b6b2b2862bd7de11b1
2013-03-20 11:35:43 -07:00
Elliott Hughes
36e69dae22
am 16617b17: am 48f4a1f8: am 8c4c7b6a: Merge "Use H rather than k in date/time formats."
...
* commit '16617b1712c1538da1912ae63ae3cd0d5057bfb4':
Use H rather than k in date/time formats.
2013-03-20 16:59:57 +00:00
Elliott Hughes
16617b1712
am 48f4a1f8: am 8c4c7b6a: Merge "Use H rather than k in date/time formats."
...
* commit '48f4a1f86e59c97a0a67d520ff0daa3726e2f62b':
Use H rather than k in date/time formats.
2013-03-20 09:52:38 -07:00
Elliott Hughes
48f4a1f86e
am 8c4c7b6a: Merge "Use H rather than k in date/time formats."
...
* commit '8c4c7b6a9851554371f94aef9f09813a7f0bc14e':
Use H rather than k in date/time formats.
2013-03-20 09:47:31 -07:00
Elliott Hughes
8c4c7b6a98
Merge "Use H rather than k in date/time formats."
2013-03-20 16:34:49 +00:00
Andrew Hsieh
ead8a4956e
am 89096dec: am 76a2d4ef: am fa33fb11: Merge "Clean up unnecessary wrap functions."
...
* commit '89096decc2d88dd33564648ab5335e8a900926df':
Clean up unnecessary wrap functions.
2013-03-20 15:12:19 +00:00
Andrew Hsieh
6d39f0cc1a
am 3c5eda26: am a20e67b5: am 1fa69e47: Merge "Don\'t use errno directly"
...
* commit '3c5eda266e75cdc5fabf9e30e95cd689cdbaaba8':
Don't use errno directly
2013-03-20 15:12:18 +00:00
Andrew Hsieh
89096decc2
am 76a2d4ef: am fa33fb11: Merge "Clean up unnecessary wrap functions."
...
* commit '76a2d4ef3e70aa986ca9fff9f77c2af053679c4b':
Clean up unnecessary wrap functions.
2013-03-20 08:07:41 -07:00
Andrew Hsieh
3c5eda266e
am a20e67b5: am 1fa69e47: Merge "Don\'t use errno directly"
...
* commit 'a20e67b5abc7f6e8292cd46190b983eff2ee5352':
Don't use errno directly
2013-03-20 08:07:40 -07:00
Andrew Hsieh
76a2d4ef3e
am fa33fb11: Merge "Clean up unnecessary wrap functions."
...
* commit 'fa33fb113275a4e78cb635f159760bcebf8cfe3c':
Clean up unnecessary wrap functions.
2013-03-20 07:51:20 -07:00
Andrew Hsieh
a20e67b5ab
am 1fa69e47: Merge "Don\'t use errno directly"
...
* commit '1fa69e4787806be478ca8440468d598209da01e5':
Don't use errno directly
2013-03-20 07:51:19 -07:00
Andrew Hsieh
fa33fb1132
Merge "Clean up unnecessary wrap functions."
2013-03-20 14:43:48 +00:00
Andrew Hsieh
1fa69e4787
Merge "Don't use errno directly"
2013-03-20 14:38:07 +00:00
Lai Wei-Chih
3917ab0c97
Clean up unnecessary wrap functions.
...
For wrap functions that call real function directly, it could be removed.
Change-Id: I261aa6639349da776e835b9eb74f00b246d4e3c1
2013-03-20 14:30:13 +08:00
Andrew Hsieh
78175cbcc5
Don't use errno directly
...
errno in MIPS is macro for "*__errno)()". Use of errno inside
WRAP(__errno)() cause infinite loop. This may happen in other
wrapper functions which access errno.
Change all error to *REAL(__error)()
Change-Id: I1c09d84a58855bd7896fcd4e70f740b8a0f0b386
2013-03-19 18:06:30 -07:00
Santos Cordon
5f3f4a95a7
am 957d3902: Merge "Adding dialer to test_defs & coverage_targets" into jb-mr2-dev
...
* commit '957d39024451d73776056065be62a168fb787ba1':
Adding dialer to test_defs & coverage_targets
2013-03-19 21:22:22 +00:00
Santos Cordon
957d390244
Merge "Adding dialer to test_defs & coverage_targets" into jb-mr2-dev
2013-03-19 21:18:19 +00:00
Santos Cordon
ddd7ea4c30
Adding dialer to test_defs & coverage_targets
...
Change-Id: I62ef6fd38f8287b00d7fe33205470fe31fdb0b83
2013-03-19 12:08:05 -07:00
Adam Koch
75517ebdee
am bae0692c: am 5004577d: am 303c2c87: am 0a605d37: am 90808a36: am bc1a645f: Contacts Provider Training Class - Sample App Initial Commit This is the sample app for the Contacts Provider Android training class. It\'s a basic master/detail view with a list of contacts
...
* commit 'bae0692c9c595a2a8f41701840806a4f15c412c3':
Contacts Provider Training Class - Sample App Initial Commit This is the sample app for the Contacts Provider Android training class. It's a basic master/detail view with a list of contacts in the master and contact name, photo and mailing addresses in the detail. This sample app is backward compatible to API level 7 and also optimized for all screen sizes.
2013-03-19 18:38:51 +00:00