Commit Graph

10038 Commits

Author SHA1 Message Date
Xavier Ducrohet
b89ad503b3 am fd9cdb46: Increase platform sdk package revision. do not merge.
* commit 'fd9cdb46a064d3ecc46aa05fa9c023ae648f07f1':
  Increase platform sdk package revision. do not merge.
2012-02-16 15:33:18 -08:00
Xavier Ducrohet
fd9cdb46a0 Increase platform sdk package revision. do not merge.
Change-Id: I51125369a0b2ba1376a66924b04b0cd825d82f5d
2012-02-16 15:31:20 -08:00
The Android Open Source Project
557eab08a2 am d2cfa3f7: am b6f94723: Reconcile with ics-mr1-release
* commit 'd2cfa3f7ce9f958fb6133494f9c5761cbea7ff59':
2012-02-16 11:25:53 -08:00
The Android Open Source Project
3de532d32f am 5c740084: am c263b345: Reconcile with ics-mr1-release
* commit '5c74008434167b0358c6ebbd5886565d78413de0':
2012-02-16 11:25:30 -08:00
Xavier Ducrohet
d980133a22 am 3837d458: (-s ours) am ae0c9dfd: am 52feec59: Update rev numbers of SDK packages. DO NOT MERGE.
* commit '3837d4581ec6008e2889e730faa05f6f680381cf':
2012-02-16 11:25:10 -08:00
Xavier Ducrohet
ad658f32b0 am b0069f56: (-s ours) am aa55fa50: am 52feec59: Update rev numbers of SDK packages. DO NOT MERGE.
* commit 'b0069f5644ef97a841d5872bfe12296ddfe73618':
  Update rev numbers of SDK packages. DO NOT MERGE.
2012-02-16 11:25:09 -08:00
The Android Open Source Project
d2cfa3f7ce am b6f94723: Reconcile with ics-mr1-release
* commit 'b6f947238f459be80a9327890992c32bc89b5674':
2012-02-16 10:16:10 -08:00
The Android Open Source Project
b6f947238f Reconcile with ics-mr1-release
Change-Id: I846571d58584c9f58a20e8c9d1b144a93801c834
2012-02-16 10:14:42 -08:00
The Android Open Source Project
5c74008434 am c263b345: Reconcile with ics-mr1-release
* commit 'c263b3450fc291f367eb277e73b2b70060834707':
2012-02-16 10:11:49 -08:00
The Android Open Source Project
c263b3450f Reconcile with ics-mr1-release
Change-Id: Ibf45e3ef58ab7a50e362da85993c4332636f32f7
2012-02-16 10:10:08 -08:00
Xavier Ducrohet
3837d4581e am ae0c9dfd: am 52feec59: Update rev numbers of SDK packages. DO NOT MERGE.
* commit 'ae0c9dfd62619a2dec14291b4e292566beb008e5':
2012-02-16 09:58:27 -08:00
Xavier Ducrohet
b0069f5644 am aa55fa50: am 52feec59: Update rev numbers of SDK packages. DO NOT MERGE.
* commit 'aa55fa5061d768438506a5065700cefab539119f':
  Update rev numbers of SDK packages. DO NOT MERGE.
2012-02-16 09:57:16 -08:00
Xavier Ducrohet
ae0c9dfd62 am 52feec59: Update rev numbers of SDK packages. DO NOT MERGE.
* commit '52feec594a769653625f6089cfcd5398332922ea':
  Update rev numbers of SDK packages. DO NOT MERGE.
2012-02-16 09:56:04 -08:00
Xavier Ducrohet
c96cb33fbf am 52feec59: Update rev numbers of SDK packages. DO NOT MERGE.
* commit '52feec594a769653625f6089cfcd5398332922ea':
  Update rev numbers of SDK packages. DO NOT MERGE.
2012-02-16 09:55:56 -08:00
Xavier Ducrohet
aa55fa5061 am 52feec59: Update rev numbers of SDK packages. DO NOT MERGE.
* commit '52feec594a769653625f6089cfcd5398332922ea':
  Update rev numbers of SDK packages. DO NOT MERGE.
2012-02-16 09:55:44 -08:00
Xavier Ducrohet
52feec594a Update rev numbers of SDK packages. DO NOT MERGE.
Change-Id: Idc750d5bd63186157cd2cb08c28e73e9894c34bd
2012-02-15 18:32:11 -08:00
Jason Sams
97e2d1bfca Use IO stream
Change-Id: I668383598a326f32f96685bb8ced3900b004ea82
2012-02-15 11:39:11 -08:00
Jean-Baptiste Queru
a916f10247 am 0f043b53: (-s ours) am 2ea5b27e: am 96a4c245: am 5539b1bf: Merge "Merge "Projects whitelisted for Windows SDK compilation.""
* commit '0f043b53fea6e48ffcaa620a1c5c9eb5b80306ee':
  Merge "Projects whitelisted for Windows SDK compilation."
2012-02-15 07:53:40 -08:00
The Android Automerger
a79e5f9b75 merge in jb-release history after reset to master 2012-02-15 07:00:22 -08:00
Jeff Sharkey
2753baa358 Add volley target to runtest.
Change-Id: Ibca1fac9e066a5d0058c47f209e63521ef980080
2012-02-14 17:30:49 -08:00
Jean-Baptiste Queru
0f043b53fe am 2ea5b27e: am 96a4c245: am 5539b1bf: Merge "Merge "Projects whitelisted for Windows SDK compilation.""
* commit '2ea5b27ef56cb5666dabd09aec2289b3d80ad6ad':
  Merge "Projects whitelisted for Windows SDK compilation."
2012-02-14 16:25:15 -08:00
Jean-Baptiste Queru
2ea5b27ef5 am 96a4c245: am 5539b1bf: Merge "Merge "Projects whitelisted for Windows SDK compilation.""
* commit '96a4c2452e0f671abf3d66c6dfd9ac75f7105f70':
  Merge "Projects whitelisted for Windows SDK compilation."
2012-02-14 14:54:27 -08:00
Jean-Baptiste Queru
96a4c2452e am 5539b1bf: Merge "Merge "Projects whitelisted for Windows SDK compilation.""
* commit '5539b1bf6be817b538e9490c826151415f445081':
  Merge "Projects whitelisted for Windows SDK compilation."
2012-02-14 14:51:40 -08:00
The Android Automerger
d16ed56822 merge in ics-mr1-release history after reset to ics-mr1 2012-02-14 14:14:35 -08:00
Dianne Hackborn
e7fcf8f01e Merge "Remove old development settings." 2012-02-14 14:07:22 -08:00
Dianne Hackborn
3619336b15 Remove old development settings.
These are redundant with the new ones in the settings app, and in
some cases conflict with them (or just don't work).

Change-Id: I8e03ae1d77c6dfadcd7fdfc80279b54a3f65e7df
2012-02-14 13:51:05 -08:00
Jean-Baptiste Queru
5539b1bf6b Merge "Merge "Projects whitelisted for Windows SDK compilation."" 2012-02-14 13:02:09 -08:00
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)

Change-Id: I9ea5720291c9057aab3cd4f7f590fa2f7ae17444
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