OSDN Git Service
Jack Palevich [Fri, 29 Jan 2010 22:28:47 +0000 (14:28 -0800)]
Merge "Add API Demos showing how to use cube maps and frame buffer objects."
Jean-Baptiste Queru [Fri, 29 Jan 2010 21:28:08 +0000 (13:28 -0800)]
am
40a17a9c: am
c363d4e7: Merge "remove references to TARGET_HARDWARE_3D" into eclair-mr2
Merge commit '
40a17a9cba51656945212d1b21a225a7ca3e87e2'
* commit '
40a17a9cba51656945212d1b21a225a7ca3e87e2':
remove references to TARGET_HARDWARE_3D
Jean-Baptiste Queru [Fri, 29 Jan 2010 21:09:55 +0000 (13:09 -0800)]
am
c363d4e7: Merge "remove references to TARGET_HARDWARE_3D" into eclair-mr2
Merge commit '
c363d4e72bc3f0dd9d4607f0ad16d9fcb6fb7129' into eclair-mr2-plus-aosp
* commit '
c363d4e72bc3f0dd9d4607f0ad16d9fcb6fb7129':
remove references to TARGET_HARDWARE_3D
Jean-Baptiste Queru [Fri, 29 Jan 2010 18:05:26 +0000 (10:05 -0800)]
Merge "remove references to TARGET_HARDWARE_3D" into eclair-mr2
Brett Chabot [Fri, 29 Jan 2010 17:56:54 +0000 (09:56 -0800)]
Merge "Refactor out a DeviceConnector helper class from hosttestlib for reuse."
Jack Palevich [Fri, 29 Jan 2010 12:58:38 +0000 (20:58 +0800)]
Add API Demos showing how to use cube maps and frame buffer objects.
Brett Chabot [Fri, 29 Jan 2010 02:44:22 +0000 (18:44 -0800)]
Refactor out a DeviceConnector helper class from hosttestlib for reuse.
James Yum [Thu, 28 Jan 2010 23:31:04 +0000 (15:31 -0800)]
am
a3c89d73: am
b8168f27: Merge "Market licensing server library core." into eclair
Merge commit '
a3c89d73bda785739b3396993c2491768bee2c23'
* commit '
a3c89d73bda785739b3396993c2491768bee2c23':
Market licensing server library core.
Brett Chabot [Thu, 28 Jan 2010 23:31:00 +0000 (15:31 -0800)]
am
d392646b: am
e848f6b2: Merge "Fix cts-content testdef." into eclair
Merge commit '
d392646bfb9e52b1ec390ba1683cfdf1cc396c71'
* commit '
d392646bfb9e52b1ec390ba1683cfdf1cc396c71':
Fix cts-content testdef.
Romain Guy [Thu, 28 Jan 2010 23:30:56 +0000 (15:30 -0800)]
am
9c5363b0: am
897af093: Add uses-feature for live wallpaper sample.
Merge commit '
9c5363b081dcbe1da924a274d7a57e20f85d1b60'
* commit '
9c5363b081dcbe1da924a274d7a57e20f85d1b60':
Add uses-feature for live wallpaper sample.
Raphael [Thu, 28 Jan 2010 23:09:59 +0000 (15:09 -0800)]
am
cb399d52: am
d51d36fa: Windows SDK: package new tools/find_java.bat
Merge commit '
cb399d52cfae83bc4bbc4672b8728144b932c14a'
* commit '
cb399d52cfae83bc4bbc4672b8728144b932c14a':
Windows SDK: package new tools/find_java.bat
Dan Bornstein [Thu, 28 Jan 2010 21:50:13 +0000 (13:50 -0800)]
We are living in the future.
Change-Id: I3f6e29063fe87407ace3fb2731521a5d290d1e75
Dianne Hackborn [Thu, 28 Jan 2010 03:26:31 +0000 (19:26 -0800)]
Update to follow device policy API changes.
Dirk Dougherty [Thu, 28 Jan 2010 20:37:28 +0000 (12:37 -0800)]
am
07b5c3bd: am
c220077d: Merge "SDK doc change: Misc fixes." into eclair
Merge commit '
07b5c3bdb76e7f4b4ceefb48e5cf11ed789bb0c2'
* commit '
07b5c3bdb76e7f4b4ceefb48e5cf11ed789bb0c2':
SDK doc change: Misc fixes.
James Yum [Thu, 28 Jan 2010 18:51:19 +0000 (10:51 -0800)]
am
b8168f27: Merge "Market licensing server library core." into eclair
Merge commit '
b8168f27f6f5b6b0ced5ef3210c0e89e8d3a5ae2' into eclair-plus-aosp
* commit '
b8168f27f6f5b6b0ced5ef3210c0e89e8d3a5ae2':
Market licensing server library core.
Brett Chabot [Thu, 28 Jan 2010 18:51:15 +0000 (10:51 -0800)]
am
e848f6b2: Merge "Fix cts-content testdef." into eclair
Merge commit '
e848f6b2c72fd07a1ff58cd090c22b3ff5b935f9' into eclair-plus-aosp
* commit '
e848f6b2c72fd07a1ff58cd090c22b3ff5b935f9':
Fix cts-content testdef.
James Yum [Thu, 28 Jan 2010 18:36:53 +0000 (10:36 -0800)]
Merge "Market licensing server library core." into eclair
Xavier Ducrohet [Thu, 28 Jan 2010 18:09:21 +0000 (10:09 -0800)]
am
a7945e3b: am
a6181df4: Add Dell Mini5 to the USB driver.
Merge commit '
a7945e3b9c7bfceaa6c6dde1fdd1a7916df339e7'
* commit '
a7945e3b9c7bfceaa6c6dde1fdd1a7916df339e7':
Add Dell Mini5 to the USB driver.
James Yum [Tue, 26 Jan 2010 04:17:53 +0000 (20:17 -0800)]
Market licensing server library core.
new file: ILicenseResultListener.aidl
new file: ILicensingService.aidl
new file: LicenseChecker.java
new file: LicenseCheckerCallback.java
new file: Policy.java
new file: ResponseData.java
new file: StrictPolicy.java
new file: LicenseValidator.java
Brett Chabot [Thu, 28 Jan 2010 01:54:29 +0000 (17:54 -0800)]
Merge "Fix cts-content testdef." into eclair
Dan Egnor [Thu, 28 Jan 2010 01:53:45 +0000 (17:53 -0800)]
Merge "Add a native crash facility to Bad Behavior."
Brett Chabot [Thu, 28 Jan 2010 01:17:16 +0000 (17:17 -0800)]
Fix cts-content testdef.
Change-Id: I02c98f57c0fbf7cd7fbcdf3e7ba642e0d66acf93
Romain Guy [Thu, 28 Jan 2010 01:04:23 +0000 (17:04 -0800)]
am
897af093: Add uses-feature for live wallpaper sample.
Merge commit '
897af09372ca7c95db6c12554d9ff6fcec81ad58' into eclair-plus-aosp
* commit '
897af09372ca7c95db6c12554d9ff6fcec81ad58':
Add uses-feature for live wallpaper sample.
Romain Guy [Thu, 28 Jan 2010 00:49:32 +0000 (16:49 -0800)]
Add uses-feature for live wallpaper sample.
Change-Id: I766d72ea79e8ef9530b2c485376a3429b530a00f
Dan Egnor [Wed, 27 Jan 2010 23:10:58 +0000 (15:10 -0800)]
Add a native crash facility to Bad Behavior.
Neal Nguyen [Sat, 16 Jan 2010 03:43:23 +0000 (19:43 -0800)]
Modifications to test_defs.xml for FrameworksTests files move.
Neal Nguyen [Wed, 27 Jan 2010 22:03:28 +0000 (14:03 -0800)]
Merge "Modifications to test_defs.xml for CoreTests files move."
Neal Nguyen [Thu, 14 Jan 2010 22:13:37 +0000 (14:13 -0800)]
Modifications to test_defs.xml for CoreTests files move.
Dianne Hackborn [Wed, 27 Jan 2010 02:04:54 +0000 (18:04 -0800)]
More device admin work:
- Example warning message when disabling.
- UI to set maximum failed password attempts.
Raphael [Wed, 27 Jan 2010 00:28:13 +0000 (16:28 -0800)]
am
d51d36fa: Windows SDK: package new tools/find_java.bat
Merge commit '
d51d36fa5444ef5f28dbbe5903949e1a75bb2510' into eclair-plus-aosp
* commit '
d51d36fa5444ef5f28dbbe5903949e1a75bb2510':
Windows SDK: package new tools/find_java.bat
Raphael [Wed, 27 Jan 2010 00:14:55 +0000 (16:14 -0800)]
Windows SDK: package new tools/find_java.bat
SDK Bug:
2315813
Change-Id: Ice0eb6327b153fcaab42477cd4d3aa8ee12e0063
Dianne Hackborn [Tue, 26 Jan 2010 02:58:34 +0000 (18:58 -0800)]
Update sample admin with a description to uses-policies info.
Daniel Sandler [Tue, 26 Jan 2010 20:08:19 +0000 (12:08 -0800)]
Merge "Widget to show build version at a glance."
Daniel Sandler [Tue, 26 Jan 2010 14:56:13 +0000 (09:56 -0500)]
Widget to show build version at a glance.
Extremely useful when working with different builds on
several otherwise-identical devices.
Brett Chabot [Mon, 25 Jan 2010 21:24:42 +0000 (13:24 -0800)]
Merge "Update test and code coverage definitions for obsolete/changed packages."
Brett Chabot [Mon, 25 Jan 2010 19:40:58 +0000 (11:40 -0800)]
Update test and code coverage definitions for obsolete/changed packages.
Brett Chabot [Mon, 25 Jan 2010 19:59:52 +0000 (11:59 -0800)]
Merge "Make runtest more fault tolerant on test run failures."
Brett Chabot [Mon, 25 Jan 2010 19:59:37 +0000 (11:59 -0800)]
Merge "Add support for generating coverage per test suite size to runtest."
Dirk Dougherty [Sat, 23 Jan 2010 00:49:51 +0000 (16:49 -0800)]
am
c220077d: Merge "SDK doc change: Misc fixes." into eclair
Merge commit '
c220077d52972356ff30d46d47def7669731f0d7' into eclair-plus-aosp
* commit '
c220077d52972356ff30d46d47def7669731f0d7':
SDK doc change: Misc fixes.
Dirk Dougherty [Sat, 23 Jan 2010 00:45:03 +0000 (16:45 -0800)]
Merge "SDK doc change: Misc fixes." into eclair
Dirk Dougherty [Tue, 12 Jan 2010 00:33:57 +0000 (16:33 -0800)]
SDK doc change: Misc fixes.
Bug:
2160782
Change-Id: I44d1d9687df45dae40a6922a37e6b410cc2de835
Dan Egnor [Fri, 22 Jan 2010 22:50:31 +0000 (14:50 -0800)]
Merge "Fix a bug where tapping on a bugreport mailed the wrong one, and don't crash if /sdcard/bugreports doesn't exist."
Xavier Ducrohet [Fri, 22 Jan 2010 22:50:19 +0000 (14:50 -0800)]
Merge "Move SDK files to froyo."
Xavier Ducrohet [Fri, 22 Jan 2010 21:58:38 +0000 (13:58 -0800)]
Move SDK files to froyo.
Change-Id: I55a5cb149982f1f30dc513ff018d8630d6513592
Dan Egnor [Fri, 22 Jan 2010 20:58:10 +0000 (12:58 -0800)]
Fix a bug where tapping on a bugreport mailed the wrong one,
and don't crash if /sdcard/bugreports doesn't exist.
Brett Chabot [Fri, 22 Jan 2010 01:29:18 +0000 (17:29 -0800)]
Add support for generating coverage per test suite size to runtest.
Xavier Ducrohet [Fri, 22 Jan 2010 18:52:03 +0000 (10:52 -0800)]
am
a6181df4: Add Dell Mini5 to the USB driver.
Merge commit '
a6181df43110ce1bea8a856295ce372ab06a7873' into eclair-plus-aosp
* commit '
a6181df43110ce1bea8a856295ce372ab06a7873':
Add Dell Mini5 to the USB driver.
Dan Egnor [Fri, 22 Jan 2010 01:57:25 +0000 (17:57 -0800)]
Merge "Bug report uploader utility."
Xavier Ducrohet [Fri, 22 Jan 2010 01:36:19 +0000 (17:36 -0800)]
Add Dell Mini5 to the USB driver.
Change-Id: If0758e6dc43541fd2877e7d00ff3abf9d354a299
Brett Chabot [Fri, 22 Jan 2010 01:30:47 +0000 (17:30 -0800)]
Make runtest more fault tolerant on test run failures.
Adjust so when running multiple suites, the whole run is not aborted on a
single suite failure.
Dan Egnor [Wed, 20 Jan 2010 07:08:56 +0000 (23:08 -0800)]
Bug report uploader utility.
This version is very bare-bones -- it just makes a list of filenames,
you tap on one and it makes a gmail (or whatever) message with the
file attached to it (and a default subject/body). But it's a start,
and I think much better than nothing.
Doug Zongker [Fri, 22 Jan 2010 00:10:55 +0000 (16:10 -0800)]
Merge "relocate GoogleLoginService"
Eric Rowe [Thu, 21 Jan 2010 22:54:52 +0000 (14:54 -0800)]
am
14dbea61: (-s ours) am
d98ba32e: DO NOT MERGE Fix bug where monkey always tries to run multiple scripts.
Merge commit '
14dbea614b9728b4dbdcf5fad2831b79fc65233e'
* commit '
14dbea614b9728b4dbdcf5fad2831b79fc65233e':
DO NOT MERGE Fix bug where monkey always tries to run multiple scripts.
Eric Rowe [Thu, 21 Jan 2010 22:54:48 +0000 (14:54 -0800)]
am
329f4007: (-s ours) am
7d961f86: DO NOT MERGE Create way to run monkey with multiple scripts.
Merge commit '
329f40076426033ca998a7ef7b98bfd6dc51ed2e'
* commit '
329f40076426033ca998a7ef7b98bfd6dc51ed2e':
DO NOT MERGE Create way to run monkey with multiple scripts.
Doug Zongker [Thu, 21 Jan 2010 22:36:08 +0000 (14:36 -0800)]
relocate GoogleLoginService
Change-Id: Ic634e64593c850efe0b81811a60cee4b34257bc8
Dianne Hackborn [Wed, 20 Jan 2010 21:43:01 +0000 (13:43 -0800)]
Start implementing UI for changing requested policies.
Derek Sollenberger [Thu, 21 Jan 2010 20:04:58 +0000 (15:04 -0500)]
Removing unused parameter from NP_Initialize.
Mathias Agopian [Wed, 20 Jan 2010 23:25:55 +0000 (15:25 -0800)]
fix [
2179436] Maps does not display compass when option is turned on
remove the compass option from SpareParts
Eric Rowe [Wed, 20 Jan 2010 00:02:09 +0000 (16:02 -0800)]
Merge commit '
f7964404' into manualmerge
David Turner [Tue, 19 Jan 2010 08:01:46 +0000 (00:01 -0800)]
am
a84a9656: am
23d8ded2: Merge "Update documentation for OpenGL ES 1.0 / 1.1 / 2.0" into eclair
Merge commit '
a84a9656b33c3e90a0747aff26272a7a316bc298'
* commit '
a84a9656b33c3e90a0747aff26272a7a316bc298':
Update documentation for OpenGL ES 1.0 / 1.1 / 2.0
Dianne Hackborn [Sun, 17 Jan 2010 23:18:42 +0000 (15:18 -0800)]
Merge "Initial sample code for writing a device policy."
Dianne Hackborn [Wed, 13 Jan 2010 02:17:18 +0000 (18:17 -0800)]
Initial sample code for writing a device policy.
Fred Quintana [Fri, 15 Jan 2010 19:05:13 +0000 (11:05 -0800)]
Merge "rename testHasFeatures to hasFeatures"
Andrew Stadler [Fri, 15 Jan 2010 07:04:54 +0000 (23:04 -0800)]
Add browser intermediates to fix eclipse build
Needed because EventLogTags have moved.
Fred Quintana [Fri, 15 Jan 2010 02:11:17 +0000 (18:11 -0800)]
rename testHasFeatures to hasFeatures
Eric Rowe [Fri, 15 Jan 2010 01:12:33 +0000 (17:12 -0800)]
am
d98ba32e: DO NOT MERGE Fix bug where monkey always tries to run multiple scripts.
Merge commit '
d98ba32eeff587a30396fa24728a1150de9dc305' into eclair-plus-aosp
* commit '
d98ba32eeff587a30396fa24728a1150de9dc305':
DO NOT MERGE Fix bug where monkey always tries to run multiple scripts.
Eric Rowe [Fri, 15 Jan 2010 01:12:28 +0000 (17:12 -0800)]
am
7d961f86: DO NOT MERGE Create way to run monkey with multiple scripts.
Merge commit '
7d961f86208b35c12867a049d4bb815da72167d3' into eclair-plus-aosp
* commit '
7d961f86208b35c12867a049d4bb815da72167d3':
DO NOT MERGE Create way to run monkey with multiple scripts.
Eric Rowe [Wed, 4 Nov 2009 02:24:47 +0000 (18:24 -0800)]
DO NOT MERGE Fix bug where monkey always tries to run multiple scripts.
Change condition so MonkeySourceRandromScript is only triggered on multiple
scripts.
Eric Rowe [Wed, 28 Oct 2009 22:25:45 +0000 (15:25 -0700)]
DO NOT MERGE Create way to run monkey with multiple scripts.
By giving multiple -f arguments, the monkey will randomly choose between the
scripts. Also, add the --setup argument which will run a setup script before
starting to play the other scripts in random order.
Marco Nelissen [Fri, 15 Jan 2010 00:04:35 +0000 (16:04 -0800)]
Force LANG to C in the findunusedresources script, otherwise it takes forever to run.
Fred Quintana [Thu, 14 Jan 2010 22:18:25 +0000 (14:18 -0800)]
Merge "add support for testing testFeatures()"
Fred Quintana [Thu, 14 Jan 2010 20:22:55 +0000 (12:22 -0800)]
add support for testing testFeatures()
Derek Sollenberger [Thu, 14 Jan 2010 19:31:00 +0000 (11:31 -0800)]
am
aebdb460: am
1bc5ab62: Adding a new sub-plugin that gives visual feedback for navigation keys.
Merge commit '
aebdb4608541e3ffb158283bbc249b586ad9aa8f'
* commit '
aebdb4608541e3ffb158283bbc249b586ad9aa8f':
Adding a new sub-plugin that gives visual feedback for navigation keys.
Derek Sollenberger [Thu, 14 Jan 2010 19:23:01 +0000 (11:23 -0800)]
am
1bc5ab62: Adding a new sub-plugin that gives visual feedback for navigation keys.
Merge commit '
1bc5ab625c5ca84a3e0f240b58327d8084af22a8' into eclair-mr2-plus-aosp
* commit '
1bc5ab625c5ca84a3e0f240b58327d8084af22a8':
Adding a new sub-plugin that gives visual feedback for navigation keys.
Derek Sollenberger [Thu, 14 Jan 2010 16:44:37 +0000 (11:44 -0500)]
Adding a new sub-plugin that gives visual feedback for navigation keys.
Eric Rowe [Thu, 14 Jan 2010 03:29:32 +0000 (19:29 -0800)]
am
c1d00a99: Merge "Fix how the monkey counts events for scripts." into eclair
Merge commit '
c1d00a99f3dcacf7b0235e386a2aa0902e07179e' into eclair-plus-aosp
* commit '
c1d00a99f3dcacf7b0235e386a2aa0902e07179e':
Fix how the monkey counts events for scripts.
Eric Rowe [Thu, 14 Jan 2010 03:25:21 +0000 (19:25 -0800)]
Merge "Fix how the monkey counts events for scripts." into eclair
Eric Rowe [Wed, 13 Jan 2010 23:55:53 +0000 (15:55 -0800)]
Fix how the monkey counts events for scripts.
Instead of the monkey counting up to the count times the number of events in the
script, the monkey will now only increment the count when the script reaches the
end of the file. This allows us to have multiple script files with differing
event counts in each.
Conflicts:
cmds/monkey/src/com/android/commands/monkey/Monkey.java
David Turner [Thu, 14 Jan 2010 01:25:42 +0000 (17:25 -0800)]
am
23d8ded2: Merge "Update documentation for OpenGL ES 1.0 / 1.1 / 2.0" into eclair
Merge commit '
23d8ded2e1fcf6e74a793b2931539fc71d4e7b6c' into eclair-plus-aosp
* commit '
23d8ded2e1fcf6e74a793b2931539fc71d4e7b6c':
Update documentation for OpenGL ES 1.0 / 1.1 / 2.0
David Turner [Thu, 14 Jan 2010 01:21:11 +0000 (17:21 -0800)]
Merge "Update documentation for OpenGL ES 1.0 / 1.1 / 2.0" into eclair
David 'Digit' Turner [Thu, 14 Jan 2010 00:50:57 +0000 (16:50 -0800)]
Update documentation for OpenGL ES 1.0 / 1.1 / 2.0
Eric Rowe [Wed, 13 Jan 2010 23:45:04 +0000 (15:45 -0800)]
am
8315bb49: (-s ours) am
b2fa7700: DO NOT MERGE Modify Monkey so that scripts can use raw and user events.
Merge commit '
8315bb4933c49d45f6b080cc8fd46f0bfadeee51'
* commit '
8315bb4933c49d45f6b080cc8fd46f0bfadeee51':
DO NOT MERGE Modify Monkey so that scripts can use raw and user events.
Eric Rowe [Wed, 13 Jan 2010 23:41:28 +0000 (15:41 -0800)]
am
b2fa7700: DO NOT MERGE Modify Monkey so that scripts can use raw and user events.
Merge commit '
b2fa770013cf1b6b8bf0619a946a54feafec5197' into eclair-plus-aosp
* commit '
b2fa770013cf1b6b8bf0619a946a54feafec5197':
DO NOT MERGE Modify Monkey so that scripts can use raw and user events.
Eric Rowe [Tue, 20 Oct 2009 01:06:38 +0000 (18:06 -0700)]
DO NOT MERGE Modify Monkey so that scripts can use raw and user events.
Fix javadoc comment in MonkeySourceRandom.java and combine raw events and user
events in MonkeySourceScript.java. Also, fix bug where too few arguments in
the script causes a RuntimeException.
Raphael Moll [Tue, 12 Jan 2010 23:43:18 +0000 (15:43 -0800)]
am
9edfe975: am
2b9a0444: Merge "Add etc1tool to Windows SDK." into eclair
Merge commit '
9edfe9759827ec86584b72b038c7ff5f9cf054c0'
* commit '
9edfe9759827ec86584b72b038c7ff5f9cf054c0':
Add etc1tool to Windows SDK.
Raphael Moll [Tue, 12 Jan 2010 23:38:37 +0000 (15:38 -0800)]
am
2b9a0444: Merge "Add etc1tool to Windows SDK." into eclair
Merge commit '
2b9a0444eaa9a3ba3e527990babb6a44f1ae5739' into eclair-plus-aosp
* commit '
2b9a0444eaa9a3ba3e527990babb6a44f1ae5739':
Add etc1tool to Windows SDK.
Raphael Moll [Tue, 12 Jan 2010 23:32:03 +0000 (15:32 -0800)]
Merge "Add etc1tool to Windows SDK." into eclair
Xavier Ducrohet [Tue, 12 Jan 2010 21:12:19 +0000 (13:12 -0800)]
am
7ae4c402: am
2f2fb96b: Make the SDK packaging put the samples in the root folder.
Merge commit '
7ae4c4026a3e0596d32983003594abb0d3df80cc'
* commit '
7ae4c4026a3e0596d32983003594abb0d3df80cc':
Make the SDK packaging put the samples in the root folder.
Xavier Ducrohet [Tue, 12 Jan 2010 20:46:21 +0000 (12:46 -0800)]
am
2f2fb96b: Make the SDK packaging put the samples in the root folder.
Merge commit '
2f2fb96b4b037a016336a98e3b637f4394e1f323' into eclair-plus-aosp
* commit '
2f2fb96b4b037a016336a98e3b637f4394e1f323':
Make the SDK packaging put the samples in the root folder.
Xavier Ducrohet [Tue, 12 Jan 2010 20:32:12 +0000 (12:32 -0800)]
Make the SDK packaging put the samples in the root folder.
Change-Id: Icb88f88d503de9690ba210c0bfabdc0598021860
Raphael [Tue, 12 Jan 2010 19:11:07 +0000 (11:11 -0800)]
Add etc1tool to Windows SDK.
SDK BUG
2368918
This depends on Change I1b4f5e39 from build/core.
Change-Id: I8348514506742aa70cdee057e94069a67357a689
Marco Nelissen [Tue, 12 Jan 2010 17:44:39 +0000 (09:44 -0800)]
Set the property to enable stagefright in the simulator.
Dan Egnor [Mon, 11 Jan 2010 22:24:45 +0000 (14:24 -0800)]
Fix build (was broken by bad up merge)
Derek Sollenberger [Mon, 11 Jan 2010 22:13:18 +0000 (14:13 -0800)]
Merge "resolved conflicts for merge of
a85d523b to master"
Derek Sollenberger [Mon, 11 Jan 2010 22:12:46 +0000 (17:12 -0500)]
resolved conflicts for merge of
a85d523b to master
Trevor Johns [Mon, 11 Jan 2010 22:09:50 +0000 (14:09 -0800)]
am
7b48a646: am
c7d2c458: Merge "Adding index file for BusinessCard sample. This will be displayed in the HTML documentation when this sample is selected via the Resource tab." into eclair
Merge commit '
7b48a6463f960bf63f43e46900ef92bc3b867aa1'
* commit '
7b48a6463f960bf63f43e46900ef92bc3b867aa1':
Adding index file for BusinessCard sample. This will be displayed in the HTML
Trevor Johns [Mon, 11 Jan 2010 22:05:34 +0000 (14:05 -0800)]
am
c7d2c458: Merge "Adding index file for BusinessCard sample. This will be displayed in the HTML documentation when this sample is selected via the Resource tab." into eclair
Merge commit '
c7d2c4580552a4921ed1f1fa78b0a180eb995193' into eclair-plus-aosp
* commit '
c7d2c4580552a4921ed1f1fa78b0a180eb995193':
Adding index file for BusinessCard sample. This will be displayed in the HTML
Trevor Johns [Mon, 11 Jan 2010 22:00:50 +0000 (14:00 -0800)]
Merge "Adding index file for BusinessCard sample. This will be displayed in the HTML documentation when this sample is selected via the Resource tab." into eclair
Xavier Ducrohet [Mon, 11 Jan 2010 21:51:21 +0000 (13:51 -0800)]
am
7f5c515c: am
ef54fe9a: Fix compilation error by declaring stride before the first goto
Merge commit '
7f5c515c64a62c400f692ec2c3670a7b16a01a91'
* commit '
7f5c515c64a62c400f692ec2c3670a7b16a01a91':
Fix compilation error by declaring stride before the first goto
Derek Sollenberger [Mon, 11 Jan 2010 21:10:56 +0000 (13:10 -0800)]
am
d53b56d1: Removed dependence on java interfaces and use only one surface for both embedded and fullscreen surfaces.
Merge commit '
d53b56d1806161bd26c2d97b9af67ef0e41f6e25' into eclair-mr2-plus-aosp
* commit '
d53b56d1806161bd26c2d97b9af67ef0e41f6e25':
Removed dependence on java interfaces and use only one surface for both embedded and fullscreen surfaces.