Jason Noguchi
91f836cc48
Merge "Adding the mock camera activity test to continuous test."
2012-02-17 13:53:05 -08:00
Romain Guy
3b2807bfaa
Merge "Remove the GlobalTime sample app."
2012-02-17 13:12:41 -08:00
Romain Guy
3c4c9f87ef
Remove the GlobalTime sample app.
...
GlobalTime relied on obsolete private APIs.
Change-Id: I338f3f2021ba8a708056c10e3cce71307a529ea9
2012-02-17 13:07:18 -08:00
Raphael Moll
b4ce1c006d
SDK: Support generating XML with new name/vendor attributes.
...
Change-Id: I21f371879660d5b590a212fd81754fc5f128e428
2012-02-17 09:18:50 -08:00
The Android Open Source Project
5cba0cbcac
am f57689a2: Reconcile with ics-mr1-release
...
* commit 'f57689a2875c5834e583d269149555f87eb69629':
2012-02-17 09:04:05 -08:00
The Android Open Source Project
f57689a287
Reconcile with ics-mr1-release
...
Change-Id: I6c51c02fe1de073b1bb5d3cd73e9a072286b4cb8
2012-02-17 09:02:42 -08:00
The Android Open Source Project
1800a2f2d8
am 790c9ce6: Reconcile with ics-mr1-release
...
* commit '790c9ce6591f4f3f5abfbf4de6f056c10f491800':
2012-02-17 08:11:34 -08:00
The Android Open Source Project
790c9ce659
Reconcile with ics-mr1-release
...
Change-Id: Ied11f64a3034d8c8a29f2c68151f3e23564c6a69
2012-02-17 08:09:27 -08:00
Jason Noguchi
b707698b1c
Adding the mock camera activity test to continuous test.
...
Change-Id: I7a1ec1a277c4d5734b912d48cee066d3e5e1e368
2012-02-16 18:41:56 -08:00
Jeff Sharkey
98b3f7ff4e
Merge "Add volley target to runtest."
2012-02-16 18:09:26 -08:00
Bill Napier
3d3d64250d
Fix UNKNOWN keycode parsing in monkey.
...
Reported here: http://code.google.com/p/android/issues/detail?id=25369
Change the monkey's keycode parsing code to check
KeyEvent.KEYCODE_UNKNOWN instead of -1.
Change-Id: I2caa82980b83c49614a318d38c0257a5587c16cd
2012-02-16 16:58:19 -08:00
The Android Automerger
cecde327e3
merge in ics-mr1-release history after reset to ics-mr1
2012-02-16 16:24:50 -08:00
Xavier Ducrohet
8bd3426b97
am 47a86260: (-s ours) am 95605614: am fd9cdb46: Increase platform sdk package revision. do not merge.
...
* commit '47a86260ee28668f96154b509a6a3bd16b08f69e':
2012-02-16 15:37:50 -08:00
Xavier Ducrohet
37ce0b53c8
am 8ed7b3be: (-s ours) am b89ad503: am fd9cdb46: Increase platform sdk package revision. do not merge.
...
* commit '8ed7b3bef6515b733866a5741a4ed25d1272513e':
Increase platform sdk package revision. do not merge.
2012-02-16 15:37:49 -08:00
Xavier Ducrohet
47a86260ee
am 95605614: am fd9cdb46: Increase platform sdk package revision. do not merge.
...
* commit '95605614afcbcc77b80f90124085516637be11cf':
2012-02-16 15:36:29 -08:00
Xavier Ducrohet
8ed7b3bef6
am b89ad503: am fd9cdb46: Increase platform sdk package revision. do not merge.
...
* commit 'b89ad503b3840d5c3f2686c9f19183ce1c711404':
Increase platform sdk package revision. do not merge.
2012-02-16 15:36:01 -08:00
Xavier Ducrohet
95605614af
am fd9cdb46: Increase platform sdk package revision. do not merge.
...
* commit 'fd9cdb46a064d3ecc46aa05fa9c023ae648f07f1':
Increase platform sdk package revision. do not merge.
2012-02-16 15:34:11 -08:00
Xavier Ducrohet
baae7fc75d
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:36 -08:00
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