Mathias Agopian
c6746da9a5
Merge "egl.cfg can now only have a single entry"
2012-02-14 12:35:19 -08:00
Raphael Moll
f06c958f3c
Merge "Projects whitelisted for Windows SDK compilation."
...
This replaces the list maintained in build/core/main.mk
There's a similar change in sdk.git at Change Ifa8111dbae
(cherry-pick of 2b53ba5897
2012-02-14 11:11:06 -08:00
The Android Automerger
1adbf3c0d0
merge in jb-release history after reset to master
2012-02-14 07:00:25 -08:00
Mathias Agopian
baa8e96c70
egl.cfg can now only have a single entry
...
Change-Id: Ic86671e41859dbf40ed4408f62450019c2164015
2012-02-13 20:38:35 -08:00
Adam Powell
fef319c150
am 770fc91f: Update SharingSupport demo for support lib API change
...
* commit '770fc91f540e26d7b90c6799a515503ea952b421':
Update SharingSupport demo for support lib API change
2012-02-13 16:47:48 -08:00
Adam Powell
770fc91f54
Update SharingSupport demo for support lib API change
...
Change-Id: I351271b9847d7444470ed8c74dd18ff580718aca
2012-02-13 16:41:31 -08:00
Jean-Baptiste Queru
f06ece3a64
am 61b8a98d: am 077e4bb8: am 44039c68: am f987c05c: am 9ce69a5f: Merge "Make sure __u64 is defined even for strict ansi or -std=c99"
...
* commit '61b8a98d748c44b161e652f53e4fcb3ad304d192':
Make sure __u64 is defined even for strict ansi or -std=c99
2012-02-13 14:45:18 -08:00
Adam Powell
cf9d4a9ecc
am 1b15eeff: am bd4ed960: am 58589851: am 15a14930: Merge "Add AppNavigation demo" into ics-mr1
...
* commit '1b15eeff628432c5addf122830e37c0eecdcd167':
2012-02-13 14:45:17 -08:00
Jean-Baptiste Queru
61b8a98d74
am 077e4bb8: am 44039c68: am f987c05c: am 9ce69a5f: Merge "Make sure __u64 is defined even for strict ansi or -std=c99"
...
* commit '077e4bb8827a0a055e8d3cf35428c98083b063ab':
Make sure __u64 is defined even for strict ansi or -std=c99
2012-02-13 14:42:45 -08:00
Adam Powell
1b15eeff62
am bd4ed960: am 58589851: am 15a14930: Merge "Add AppNavigation demo" into ics-mr1
...
* commit 'bd4ed9606170d5d49281724bafdd3082a77e7b3c':
2012-02-13 14:42:44 -08:00
Jean-Baptiste Queru
077e4bb882
am 44039c68: am f987c05c: am 9ce69a5f: Merge "Make sure __u64 is defined even for strict ansi or -std=c99"
...
* commit '44039c689e0f117cc581c434e068436a044baa9e':
Make sure __u64 is defined even for strict ansi or -std=c99
2012-02-13 14:39:56 -08:00
Adam Powell
bd4ed96061
am 58589851: am 15a14930: Merge "Add AppNavigation demo" into ics-mr1
...
* commit '58589851a68a3769e633f34e0fdc7c8d742f86da':
2012-02-13 14:39:54 -08:00
Adam Powell
5d0c7add1e
am 2eba3e34: am 404be3bd: am 1b919a3f: am 15a14930: Merge "Add AppNavigation demo" into ics-mr1
...
* commit '2eba3e344341914bccb1b9b9bde951690b625ace':
Add AppNavigation demo
2012-02-13 14:36:19 -08:00
Adam Powell
2eba3e3443
am 404be3bd: am 1b919a3f: am 15a14930: Merge "Add AppNavigation demo" into ics-mr1
...
* commit '404be3bd4c69682bd697ff0625382e86111c23b6':
Add AppNavigation demo
2012-02-13 14:34:24 -08:00
Adam Powell
404be3bd4c
am 1b919a3f: am 15a14930: Merge "Add AppNavigation demo" into ics-mr1
...
* commit '1b919a3fb80350a6ff1857c5c3d94d86766c0555':
Add AppNavigation demo
2012-02-13 14:32:00 -08:00
Jean-Baptiste Queru
44039c689e
am f987c05c: am 9ce69a5f: Merge "Make sure __u64 is defined even for strict ansi or -std=c99"
...
* commit 'f987c05c776918d121b7e2095a232e4854fde8a8':
Make sure __u64 is defined even for strict ansi or -std=c99
2012-02-13 14:29:58 -08:00
Adam Powell
1b919a3fb8
am 15a14930: Merge "Add AppNavigation demo" into ics-mr1
...
* commit '15a14930d761d85466faf4e5f62209e8ab078b1d':
Add AppNavigation demo
2012-02-13 14:29:49 -08:00
Adam Powell
86200cff4e
am 15a14930: Merge "Add AppNavigation demo" into ics-mr1
...
* commit '15a14930d761d85466faf4e5f62209e8ab078b1d':
Add AppNavigation demo
2012-02-13 14:29:21 -08:00
Adam Powell
58589851a6
am 15a14930: Merge "Add AppNavigation demo" into ics-mr1
...
* commit '15a14930d761d85466faf4e5f62209e8ab078b1d':
Add AppNavigation demo
2012-02-13 14:29:19 -08:00
Adam Powell
15a14930d7
Merge "Add AppNavigation demo" into ics-mr1
2012-02-13 14:27:58 -08:00
Jean-Baptiste Queru
f987c05c77
am 9ce69a5f: Merge "Make sure __u64 is defined even for strict ansi or -std=c99"
...
* commit '9ce69a5f9fc1e5e4efb19b708c9aa91cfd0969db':
Make sure __u64 is defined even for strict ansi or -std=c99
2012-02-13 14:27:33 -08:00
Jean-Baptiste Queru
9ce69a5f9f
Merge "Make sure __u64 is defined even for strict ansi or -std=c99"
2012-02-13 14:24:04 -08:00
Stephen Hines
8ba7b3ebf8
am ffb9333c: Merge "Fix app bug, where some memory could remain uninitialized due to early exit."
...
* commit 'ffb9333cb40a69b578e4ffbd44526bfc11b66a03':
Fix app bug, where some memory could remain uninitialized due to early exit.
2012-02-13 13:56:45 -08:00
Stephen Hines
ffb9333cb4
Merge "Fix app bug, where some memory could remain uninitialized due to early exit."
2012-02-13 13:54:31 -08:00
The Android Automerger
97a4d91857
merge in jb-release history after reset to master
2012-02-13 08:58:29 -08:00
Dianne Hackborn
de04839b13
am de48b21c: Fix isolated process demo to work with new restrictions.
...
* commit 'de48b21c2dca2ca0d223c9be5b90d8f680f1df96':
Fix isolated process demo to work with new restrictions.
2012-02-10 11:20:06 -08:00
Dianne Hackborn
de48b21c2d
Fix isolated process demo to work with new restrictions.
...
Isolated processes can now do much less.
Change-Id: I1af8ae0d8dca72de1324d98ed6004cb3c0820a7a
2012-02-09 18:19:37 -08:00
Scott Main
2d74b81e52
am 856545fb: am 0db4fadd: am 12104d37: am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1
...
* commit '856545fbf9edcfd053605f032c670ca36d58ed4b':
2012-02-09 12:22:53 -08:00
Scott Main
0fbcef5403
am e1b0a27c: am 90d9ce81: am e4fd5043: am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1
...
* commit 'e1b0a27c90f1366ab22d673cd0d18da057e6b0d1':
docs: fix minsdkversion for native activity sample
2012-02-09 12:22:51 -08:00
Scott Main
856545fbf9
am 0db4fadd: am 12104d37: am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1
...
* commit '0db4faddb998ed3e20c698eea96aa907e9a7e294':
2012-02-09 12:20:45 -08:00
Scott Main
e1b0a27c90
am 90d9ce81: am e4fd5043: am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1
...
* commit '90d9ce81d0c35b282d48b77b8e7b8466bd758a7a':
docs: fix minsdkversion for native activity sample
2012-02-09 12:20:44 -08:00
Scott Main
0db4faddb9
am 12104d37: am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1
...
* commit '12104d3734421ca9234c3c1933fa33c239329a48':
2012-02-09 12:18:59 -08:00
Scott Main
90d9ce81d0
am e4fd5043: am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1
...
* commit 'e4fd504325a0d3b1f3a82940a6b5300679b5e574':
docs: fix minsdkversion for native activity sample
2012-02-09 12:18:44 -08:00
Scott Main
bfae3e810e
am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1
...
* commit 'de797a2fb233ce1aed1eedb9cfc629ba63bd9bd7':
docs: fix minsdkversion for native activity sample
2012-02-09 12:16:47 -08:00
Scott Main
e4fd504325
am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1
...
* commit 'de797a2fb233ce1aed1eedb9cfc629ba63bd9bd7':
docs: fix minsdkversion for native activity sample
2012-02-09 12:16:42 -08:00
Scott Main
12104d3734
am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1
...
* commit 'de797a2fb233ce1aed1eedb9cfc629ba63bd9bd7':
docs: fix minsdkversion for native activity sample
2012-02-09 12:16:41 -08:00
Scott Main
de797a2fb2
Merge "docs: fix minsdkversion for native activity sample" into ics-mr1
2012-02-09 12:15:07 -08:00
Scott Main
41b5bb95c3
docs: fix minsdkversion for native activity sample
...
Change-Id: I2d45207182f6a5b1743b574f7ab10251efd3a17a
2012-02-09 12:10:27 -08:00
Dianne Hackborn
95b4aa9750
am 37f02d80: New API demo for isolated processes.
...
* commit '37f02d80427e9520052bd670c468bda91eece395':
New API demo for isolated processes.
2012-02-09 11:22:14 -08:00
Dianne Hackborn
37f02d8042
New API demo for isolated processes.
...
Change-Id: I2b2117ae5e5005bfffe8d89df5e06cee32da603c
2012-02-09 10:51:07 -08:00
The Android Automerger
390ac902ab
merge in jb-release history after reset to master
2012-02-09 06:59:53 -08:00
Eino-Ville Talvala
ab66cdf687
am 86fa7ead: Merge "Add cleaned-up filter framework, camera, gallery back to .classpath"
...
* commit '86fa7ead3f798379190a8b46ce468c6bf67f495a':
Add cleaned-up filter framework, camera, gallery back to .classpath
2012-02-08 11:28:39 -08:00
Eino-Ville Talvala
86fa7ead3f
Merge "Add cleaned-up filter framework, camera, gallery back to .classpath"
2012-02-08 11:08:02 -08:00
Eino-Ville Talvala
8f3f77f20c
Add cleaned-up filter framework, camera, gallery back to .classpath
...
Now that the /system/media/mca code is cleaned up, add it back to
.classpath along with Camera and Gallery2, which could not be be
accessed in eclipse previously without build errors.
Change-Id: I6ff01f6fa61d33a3e5c8a9f11a564f167d81dc38
Bug-Id: 5584451
2012-02-08 10:30:00 -08:00
Janos Levai
39dc2e8d06
Fix Eclipse classpath file for ICS.
...
Change-Id: I89a6489959be450b034d295c9eee9e4622643be3
Signed-off-by: Janos Levai <digistyl3@gmail.com >
2012-02-08 18:14:44 +02:00
Stephen Hines
432b5a25e6
Fix app bug, where some memory could remain uninitialized due to early exit.
...
Change-Id: I4bdeff1c9f28c4e27f42559f89b925819b82cfc2
2012-02-07 19:55:19 -08:00
Adam Powell
247df4fe79
Add AppNavigation demo
...
This demo illustrates the use of the new support library functionality
for navigating within and across tasks using "up" navigation. This
matches the recommendations in the Android design guide.
Change-Id: I2b36c962dd24f0e0f3b3ee3f86319dafc2fc66e2
2012-02-07 15:02:57 -08:00
The Android Automerger
1f7b1ac56d
merge in jb-release history after reset to master
2012-02-07 07:00:08 -08:00
Raphael Moll
26871ff125
am fd7545f5: Merge "Win SDK: add ext4_utils to project whitelist."
...
* commit 'fd7545f53b403a3dc4418eef3e9f4699fb5d46cd':
Win SDK: add ext4_utils to project whitelist.
2012-02-06 15:43:48 -08:00
Raphael Moll
fd7545f53b
Merge "Win SDK: add ext4_utils to project whitelist."
2012-02-06 15:42:10 -08:00
