OSDN Git Service
Dirk Dougherty [Tue, 30 Nov 2010 02:15:36 +0000 (18:15 -0800)]
am
49b989c3: am
4171f296: Add AcceleromerPlay sample app to SDK samples package
* commit '
49b989c36a07a2440d94ec4f6c899f4e30be1799':
Add AcceleromerPlay sample app to SDK samples package
Dianne Hackborn [Tue, 30 Nov 2010 02:14:52 +0000 (18:14 -0800)]
Merge "New dialog sample with a lot of text and thus large dialog."
Dirk Dougherty [Tue, 30 Nov 2010 02:13:49 +0000 (18:13 -0800)]
am
4171f296: Add AcceleromerPlay sample app to SDK samples package
* commit '
4171f296681a0ef0a1df21fdc792fc9997c1146b':
Add AcceleromerPlay sample app to SDK samples package
Dirk Dougherty [Thu, 25 Nov 2010 00:12:16 +0000 (16:12 -0800)]
Add AcceleromerPlay sample app to SDK samples package
Change-Id: Id7ae8de4f3543169d6d707a470f0b872e00e953f
Dirk Dougherty [Tue, 30 Nov 2010 01:09:37 +0000 (17:09 -0800)]
am
fb381e9f: am
c73f37ba: Remove HeavyWeight sample from SDK samples package.
* commit '
fb381e9ff5cdc18d2a5463dc858980e3a609b8d0':
Remove HeavyWeight sample from SDK samples package.
Dirk Dougherty [Tue, 30 Nov 2010 01:07:26 +0000 (17:07 -0800)]
am
c73f37ba: Remove HeavyWeight sample from SDK samples package.
* commit '
c73f37ba5790cd1fe588d0f5886b677a7eaa39f0':
Remove HeavyWeight sample from SDK samples package.
Dirk Dougherty [Tue, 30 Nov 2010 00:49:12 +0000 (16:49 -0800)]
Remove HeavyWeight sample from SDK samples package.
Change-Id: Id2113b8a0cd1a7cc3d807919e6c40c50917baaea
Dirk Dougherty [Tue, 30 Nov 2010 00:57:20 +0000 (16:57 -0800)]
Remove NFCDemo from sdk samples to fix build.
Change-Id: I7ab8743d39a5a0cf60d68544c4e94c786224f78e
Dianne Hackborn [Tue, 30 Nov 2010 00:51:47 +0000 (16:51 -0800)]
New dialog sample with a lot of text and thus large dialog.
Change-Id: Iaf0cba52e51f36b98a5a4a1965f0e1eb02bb8f9f
Roman Nurik [Tue, 30 Nov 2010 00:04:40 +0000 (16:04 -0800)]
am
624ae678: am
14789d1e: Merge "Add NFCDemo to sdk.atree" into gingerbread
* commit '
624ae678ef28e9abc4902bc49d7a23dbdb63f180':
Add NFCDemo to sdk.atree
Anirudh Dewani [Tue, 30 Nov 2010 00:04:36 +0000 (16:04 -0800)]
am
35dfdb6f: am
dbe66332: Extended camera preview to switch between multiple available device cameras
* commit '
35dfdb6fc37cf72aab09713ce59bd8c6ec571fab':
Extended camera preview to switch between multiple available device cameras
Roman Nurik [Mon, 29 Nov 2010 23:54:07 +0000 (15:54 -0800)]
am
14789d1e: Merge "Add NFCDemo to sdk.atree" into gingerbread
* commit '
14789d1eab905728da4f6995816c80716caf52f4':
Add NFCDemo to sdk.atree
Anirudh Dewani [Mon, 29 Nov 2010 23:54:05 +0000 (15:54 -0800)]
am
dbe66332: Extended camera preview to switch between multiple available device cameras
* commit '
dbe66332e278962c058a596353b839a2fd6dca1b':
Extended camera preview to switch between multiple available device cameras
Roman Nurik [Mon, 29 Nov 2010 23:52:21 +0000 (15:52 -0800)]
Merge "Add NFCDemo to sdk.atree" into gingerbread
Roman Nurik [Mon, 29 Nov 2010 23:45:50 +0000 (15:45 -0800)]
Add NFCDemo to sdk.atree
Change-Id: I2e0a330a31d6d3c0b8c70c38af60118461e7e403
Andy Stadler [Mon, 29 Nov 2010 23:17:47 +0000 (15:17 -0800)]
Merge "Add display of password expiration status"
Brian Muramatsu [Mon, 29 Nov 2010 19:03:47 +0000 (11:03 -0800)]
Merge "Add "CTS Development" Tutorial"
Andy Stadler [Sat, 20 Nov 2010 08:39:10 +0000 (00:39 -0800)]
Add display of password expiration status
* Also clean up a few warnings.
Change-Id: I79d8d4c49c113e23160839ddb079a241a245729b
Anirudh Dewani [Tue, 9 Nov 2010 05:45:25 +0000 (11:15 +0530)]
Extended camera preview to switch between multiple available device cameras
Change-Id: I8e97d6182bf02cba29ae3bc9f1a7ef21a277117e
Brian Muramatsu [Mon, 4 Oct 2010 17:52:59 +0000 (10:52 -0700)]
Add "CTS Development" Tutorial
Change-Id: Ib013d2a9618eeb6499e86e405ef0ed9b18e9fa72
Jean-Baptiste Queru [Thu, 25 Nov 2010 00:27:19 +0000 (16:27 -0800)]
am
cd26dbdb: am
72cb8dd1: Merge "Updated Android build instructions to mention envsetup.sh and lunch."
* commit '
cd26dbdbb4da735129d4517e27da0f60b84ff828':
Updated Android build instructions to mention envsetup.sh and lunch.
Jean-Baptiste Queru [Wed, 24 Nov 2010 21:49:40 +0000 (13:49 -0800)]
am
72cb8dd1: Merge "Updated Android build instructions to mention envsetup.sh and lunch."
* commit '
72cb8dd12c3aa6504fb5db31bf14d31d34db0d71':
Updated Android build instructions to mention envsetup.sh and lunch.
Brad Fitzpatrick [Wed, 24 Nov 2010 21:44:49 +0000 (13:44 -0800)]
Merge "Development option to toggle StrictMode flashing."
Jean-Baptiste Queru [Wed, 24 Nov 2010 21:38:32 +0000 (13:38 -0800)]
Merge "Updated Android build instructions to mention envsetup.sh and lunch."
Brad Fitzpatrick [Wed, 24 Nov 2010 21:06:41 +0000 (13:06 -0800)]
Development option to toggle StrictMode flashing.
Change-Id: I89a6907a8d0a8a635d7af1c9d124b4531915ba2f
Sascha Brawer [Wed, 24 Nov 2010 14:20:48 +0000 (15:20 +0100)]
Updated Android build instructions to mention envsetup.sh and lunch.
Change-Id: I3922953766a2162c27d80630736e074a2b3dfb95
David 'Digit' Turner [Wed, 24 Nov 2010 06:57:19 +0000 (22:57 -0800)]
am
fd49f509: am
1e7011fc: ndk: Add auto-generated <android/api-level.h>
* commit '
fd49f509e86ccc29d992b79743dac440ad369d0f':
ndk: Add auto-generated <android/api-level.h>
David 'Digit' Turner [Wed, 24 Nov 2010 06:53:01 +0000 (22:53 -0800)]
am
1e7011fc: ndk: Add auto-generated <android/api-level.h>
* commit '
1e7011fcd5eee3190b436881af33cd9715eb8d36':
ndk: Add auto-generated <android/api-level.h>
Xavier Ducrohet [Wed, 24 Nov 2010 01:27:18 +0000 (17:27 -0800)]
Make ApiDemo compile on Java 1.5
Change-Id: I0a9d078dd9e6a6388281e492da9bd4acb9747a41
Raphael [Tue, 23 Nov 2010 23:39:37 +0000 (15:39 -0800)]
am
a65f7696: resolved conflicts for merge of
f0f624f3 to gingerbread-plus-aosp
* commit '
a65f76962f475c9c187dd63dca36e59eff84dcca':
Win SDK: Split the win-sdk makefile and script into 2 parts.
Raphael [Tue, 23 Nov 2010 23:36:17 +0000 (15:36 -0800)]
resolved conflicts for merge of
f0f624f3 to gingerbread-plus-aosp
Change-Id: I670002d7f8606f22c438057883e1a4a9fe63ebf6
Raphael Moll [Tue, 23 Nov 2010 22:35:05 +0000 (14:35 -0800)]
Merge "Win SDK: Split the win-sdk makefile and script into 2 parts."
Marco Nelissen [Tue, 23 Nov 2010 21:05:45 +0000 (13:05 -0800)]
Merge "Don't hardcode 320x480 size in the FingerPaint API demo."
Kenny Root [Tue, 23 Nov 2010 20:14:54 +0000 (12:14 -0800)]
Merge "Move Spare Parts icon to mipmap"
Kenny Root [Tue, 23 Nov 2010 20:14:47 +0000 (12:14 -0800)]
Merge "Move Dev Tools icon to mipmap"
Marco Nelissen [Tue, 23 Nov 2010 17:11:22 +0000 (09:11 -0800)]
Don't hardcode 320x480 size in the FingerPaint API demo.
Change-Id: I4de9ce1e52dda68bf4c3ab7fbd9987ca6d5548a0
Kenny Root [Tue, 23 Nov 2010 17:58:50 +0000 (09:58 -0800)]
Move Spare Parts icon to mipmap
So that the different icon densities don't get stripped out of the build
by aapt, move it to the mipmap directory.
This will ensure that any program using the getDrawableByDensity API can
read any density/size of the icon needed.
Change-Id: I48c27f7a8b115365c5827ddaa9e8710f3b81358e
Kenny Root [Tue, 23 Nov 2010 17:58:50 +0000 (09:58 -0800)]
Move Dev Tools icon to mipmap
So that the different icon densities don't get stripped out of the build
by aapt, move it to the mipmap directory.
This will ensure that any program using the getDrawableByDensity API can
read any density/size of the icon needed.
Change-Id: I8ee4f7233358be4d68133b20090323251511677a
Raphael [Tue, 23 Nov 2010 10:57:16 +0000 (02:57 -0800)]
resolved conflicts for merge of
0aa38562 to master
Change-Id: I2e79f7c906477bc5d02352de6a7be17fffb4730a
Raphael [Tue, 23 Nov 2010 10:44:59 +0000 (02:44 -0800)]
resolved conflicts for merge of
d7267fc2 to gingerbread-plus-aosp
Change-Id: Id3b056cf13bcfa50b3b4a00a22b8f482069c04c9
Raphael Moll [Tue, 23 Nov 2010 05:26:57 +0000 (21:26 -0800)]
Merge "Move <uses-sdk> before <application> in samples."
Raphael Moll [Thu, 11 Nov 2010 23:58:28 +0000 (15:58 -0800)]
Win SDK: Split the win-sdk makefile and script into 2 parts.
The main makefile+scripts to build the Windows SDK is still this
one here in development/build/tools. However it defers to a new
matching set of files in sdk/build to build and package
things that depend on the sdk.git or external/qemu.git.
This will make it easier for us to prepare SDKs based on
a tools_rN branch that isn't cut at the same time than the
platform branch.
This is a multi-part changeset. The other part is in sdk.git.
This change also definitely removes support for building
the Windows SDK under Cygwin. Only building a specific subset
of individual binaries is supported at this point.
Change-Id: I4e9a2d810cf29fae0097fbd92be0cef89c9b3505
Dianne Hackborn [Tue, 23 Nov 2010 00:15:32 +0000 (16:15 -0800)]
Sample code for new APIs to support new back stack / task navigation
Change-Id: I79d1933b894b049711781c39b8e15dbce1626448
David 'Digit' Turner [Mon, 22 Nov 2010 21:38:57 +0000 (22:38 +0100)]
ndk: Add auto-generated <android/api-level.h>
See ndk.git/build/tools/dev-generate-api-levels.sh
Change-Id: Id64e565e7da6bf23f4bfa0fca52a06dbfe843c37
Raphael Moll [Mon, 22 Nov 2010 20:39:47 +0000 (12:39 -0800)]
Move <uses-sdk> before <application> in samples.
Change-Id: Iac2644d350235e19f5109aeb25a8d6d4eb1af3fe
Joe Onorato [Fri, 19 Nov 2010 22:00:23 +0000 (14:00 -0800)]
Update Notification sample code for new APIs.
Change-Id: Icaa86212192b9c9cef89d2d6013363955bd3a668
Andy Stadler [Sat, 20 Nov 2010 00:00:40 +0000 (16:00 -0800)]
Quick bugfix for password expiration UI
Change-Id: Iecc0f6fbfe85293a6b22fd0a0ffaae69a0fbc3e9
Jack Palevich [Fri, 19 Nov 2010 10:56:04 +0000 (02:56 -0800)]
Merge "Fix potential memory leak in String8::set"
Jack Palevich [Fri, 19 Nov 2010 10:49:42 +0000 (02:49 -0800)]
Fix potential memory leak in String8::set
Not an actual leak at the moment, since no clients call set more than
once, but you never know how a class might be used in the future.
Change-Id: I601bad02eb16d522af3216ef903a190741444e4c
Eric Fischer [Fri, 19 Nov 2010 01:12:31 +0000 (17:12 -0800)]
Merge "Import initial translations for 20 new locales."
Chris Tate [Thu, 18 Nov 2010 20:48:45 +0000 (12:48 -0800)]
Merge "Add self-restore capability to Backup/Restore sample app"
Eric Fischer [Thu, 18 Nov 2010 00:19:50 +0000 (16:19 -0800)]
Import initial translations for 20 new locales.
Change-Id: Id4581e7145dd1bd884919f2ebef4f44e21158387
Xavier Ducrohet [Wed, 17 Nov 2010 21:00:32 +0000 (13:00 -0800)]
Merge "temp disable "phone" from the sdk build."
Chris Tate [Tue, 16 Nov 2010 23:41:27 +0000 (15:41 -0800)]
Add self-restore capability to Backup/Restore sample app
The Backup/Restore sample application now provides a "restore my own
last-known-good data" button. When it is clicked the app will run the
standard public BackupManager.requestRestore() operation.
(This was the one aspect of the public API that was not previously
exercised by the sample app.)
Change-Id: I8abcfbad4b27b35fe9fafbbb97f89bac1d7a668c
Xavier Ducrohet [Tue, 16 Nov 2010 02:38:11 +0000 (18:38 -0800)]
temp disable "phone" from the sdk build.
Change-Id: I1c3ce26169880d8d893bd25b8c7f7fd31cde609c
Brian Muramatsu [Tue, 16 Nov 2010 18:58:54 +0000 (10:58 -0800)]
Merge "Update Android CTS Download Link to 2.2_r4"
Glenn Kasten [Tue, 16 Nov 2010 00:28:06 +0000 (16:28 -0800)]
am
6e20b04e: am
f328f262: Merge "Remove .classpath and .project files" into gingerbread
* commit '
6e20b04ed07925521b92c70eda6d8bdcb62ff3d9':
Remove .classpath and .project files
Glenn Kasten [Tue, 16 Nov 2010 00:25:58 +0000 (16:25 -0800)]
am
f328f262: Merge "Remove .classpath and .project files" into gingerbread
* commit '
f328f262fd66f90a8ebda011e75dfcc11b65279a':
Remove .classpath and .project files
Glenn Kasten [Tue, 16 Nov 2010 00:23:34 +0000 (16:23 -0800)]
Merge "Remove .classpath and .project files" into gingerbread
Megha Joshi [Sat, 13 Nov 2010 02:34:19 +0000 (18:34 -0800)]
am
d53c6f2a: (-s ours) am
7f39ff80: Merge "NFC sample app (DO NOT MERGE)" into gingerbread
* commit '
d53c6f2ac325f6e06a94f751817a9ecdfa4eb7f1':
NFC sample app (DO NOT MERGE)
Megha Joshi [Sat, 13 Nov 2010 02:32:14 +0000 (18:32 -0800)]
am
7f39ff80: Merge "NFC sample app (DO NOT MERGE)" into gingerbread
* commit '
7f39ff802b6281b563f341dc89c58a43ec6bdd99':
NFC sample app (DO NOT MERGE)
Megha Joshi [Sat, 13 Nov 2010 02:30:14 +0000 (18:30 -0800)]
Merge "NFC sample app (DO NOT MERGE)" into gingerbread
Megha Joshi [Wed, 3 Nov 2010 06:27:24 +0000 (23:27 -0700)]
NFC sample app (DO NOT MERGE)
Change-Id: I1d1d67bbc6760cea1a0c6eccfa4d9f7b1398cd4d
Brian Muramatsu [Fri, 12 Nov 2010 20:45:00 +0000 (12:45 -0800)]
Update Android CTS Download Link to 2.2_r4
Bug
3166146
Change-Id: I91969c15c95cf208a2ae90bca6a75fb6b4a5bddd
Jim Miller [Fri, 12 Nov 2010 03:45:45 +0000 (19:45 -0800)]
Merge "Add password expiration test to DeviceAdminSample."
Jaikumar Ganesh [Fri, 12 Nov 2010 00:09:08 +0000 (16:09 -0800)]
Merge "Start the accept thread when the socket gets disconnected."
Jaikumar Ganesh [Thu, 11 Nov 2010 23:51:19 +0000 (15:51 -0800)]
Start the accept thread when the socket gets disconnected.
Change-Id: I937c19c657a1077df8c2c19b5edc3fec218e11a4
Gilles Debunne [Thu, 11 Nov 2010 20:25:27 +0000 (12:25 -0800)]
Merge "New demos and tests for Tabs in Holo theme."
Gilles Debunne [Tue, 2 Nov 2010 18:59:59 +0000 (11:59 -0700)]
New demos and tests for Tabs in Holo theme.
Change-Id: Ifd12e639e7e25e1e5ea7b1b1106789976d9450d3
Gilles Debunne [Thu, 11 Nov 2010 20:10:43 +0000 (12:10 -0800)]
Renamed fill_parent to match_parent
Change-Id: I12ddb06d560f4f373c5ad292823a4646be133744
Jim Miller [Wed, 10 Nov 2010 02:03:37 +0000 (18:03 -0800)]
Add password expiration test to DeviceAdminSample.
Change-Id: Ib5b398dc068227529d83be2b55c33225f9bbce80
Glenn Kasten [Mon, 8 Nov 2010 21:20:45 +0000 (13:20 -0800)]
am
296326ba: am
809ec924: Native audio example
* commit '
296326baa9a1e92a8603f51dc457c09d7305d8d4':
Native audio example
Raphael [Mon, 8 Nov 2010 20:51:51 +0000 (12:51 -0800)]
Merge commit '
4e75b80a' into merge
Conflicts:
host/windows/usb/android_winusb.inf
Change-Id: I64a3be958e85302d0a6213d1c46ff9e7214ef352
Glenn Kasten [Mon, 8 Nov 2010 20:13:19 +0000 (12:13 -0800)]
am
809ec924: Native audio example
* commit '
809ec924d28657e8be8ca36871ce6ddbfedcdc40':
Native audio example
Raphael Moll [Mon, 8 Nov 2010 18:13:55 +0000 (10:13 -0800)]
am
4bd402f5: Merge "Fix DOS end-of-lines in winusb INF file."
* commit '
4bd402f5f1f15a7e9f13ae0104d32285113d780b':
Fix DOS end-of-lines in winusb INF file.
Raphael Moll [Mon, 8 Nov 2010 18:02:03 +0000 (10:02 -0800)]
Merge "Fix DOS end-of-lines in winusb INF file."
Glenn Kasten [Tue, 26 Oct 2010 19:07:15 +0000 (12:07 -0700)]
Native audio example
Change-Id: Ia48597d3e94d178ec95a396c545e4a95de7c88f8
Raphael Moll [Fri, 5 Nov 2010 23:35:01 +0000 (16:35 -0700)]
Fix DOS end-of-lines in winusb INF file.
The file has a mix of unix and DOS-mode end-of-lines.
This CL just fixes the end-of-line to make it a consistent DOS-mode.
There is no change to the actualy content.
Change-Id: I6635ec87907f68e1d34c807f712723804eb0e698
Adam Powell [Fri, 5 Nov 2010 18:58:22 +0000 (11:58 -0700)]
Update modal multi-select demo to restore gracefully after orientation changes
Change-Id: I6ef6ecb28c1e0cccb2bc88be3f4a6b14351d7849
Andrew Stadler [Thu, 4 Nov 2010 21:32:31 +0000 (14:32 -0700)]
Cleanup eclipse .classpath
* New: add frameworks/base/drm
* Old: remove frameworks renderscript intermediates
Change-Id: Icb4898f2a09900595313848b2ed92a23eeb8d9a0
David 'Digit' Turner [Thu, 4 Nov 2010 17:57:25 +0000 (10:57 -0700)]
am
2b7aeaf0: am
186ce6d5: Merge "NDK: Last cleanup of the platform headers" into gingerbread
* commit '
2b7aeaf07787e414ad2af93bd88baee47b727000':
NDK: Last cleanup of the platform headers
David 'Digit' Turner [Thu, 4 Nov 2010 17:57:23 +0000 (10:57 -0700)]
am
f7b07025: am
cc5809bf: Merge "ndk: Use __ANDROID__ instead of ANDROID." into gingerbread
* commit '
f7b070255f964af5eef0e2562d892058786df2db':
ndk: Use __ANDROID__ instead of ANDROID.
Alexander Lucas [Thu, 4 Nov 2010 14:20:40 +0000 (07:20 -0700)]
am
655f02a4: am
48cc36d9: Merge "Added SIP Demo to sample apps." into gingerbread
* commit '
655f02a45669ce3b03d96cd8634bfe3745b6f725':
Added SIP Demo to sample apps.
David 'Digit' Turner [Thu, 4 Nov 2010 11:11:19 +0000 (04:11 -0700)]
am
186ce6d5: Merge "NDK: Last cleanup of the platform headers" into gingerbread
* commit '
186ce6d54380d2808acf341aec676f9c5ec56b63':
NDK: Last cleanup of the platform headers
David 'Digit' Turner [Thu, 4 Nov 2010 11:09:48 +0000 (04:09 -0700)]
Merge "NDK: Last cleanup of the platform headers" into gingerbread
David 'Digit' Turner [Thu, 4 Nov 2010 11:08:23 +0000 (04:08 -0700)]
am
cc5809bf: Merge "ndk: Use __ANDROID__ instead of ANDROID." into gingerbread
* commit '
cc5809bf2fdae2ea7b5d84b21875cd2220c66105':
ndk: Use __ANDROID__ instead of ANDROID.
David 'Digit' Turner [Wed, 27 Oct 2010 23:28:43 +0000 (16:28 -0700)]
NDK: Last cleanup of the platform headers
- fix a declaration omission in 3/<grp.h>
- add missing 8/<err.h>
- simplify 8/<stdio.h>
- update 9/ headers to the latest Bionic versions
- fix a typo in android_native_app_glue.h
- use __BEGIN_DECLS .. __END_DECLS whenever possible.
- remove C++-style comments from headers
Change-Id: I58b98b3973cde494436206194ba33416a11ca8ee
David 'Digit' Turner [Thu, 4 Nov 2010 11:06:31 +0000 (04:06 -0700)]
Merge "ndk: Use __ANDROID__ instead of ANDROID." into gingerbread
Adam Powell [Wed, 3 Nov 2010 23:57:14 +0000 (16:57 -0700)]
Add ActionBarTabs demo
Change-Id: I21087d63f78a4d35b249e7ffd92bf6823cf29b60
Chet Haase [Thu, 4 Nov 2010 01:22:44 +0000 (18:22 -0700)]
Update animation demo to use setBackgroundColor functionality on View
Change-Id: I6811fd4a3612c9af8f09e570ee3c600570cefcb1
Xavier Ducrohet [Thu, 4 Nov 2010 01:20:35 +0000 (18:20 -0700)]
Merge "Make ApiDemo build on Java 5.0"
Xavier Ducrohet [Thu, 4 Nov 2010 01:11:02 +0000 (18:11 -0700)]
Make ApiDemo build on Java 5.0
Change-Id: Ib0759e5598d73741ef9e2408f08edd5d6b38288b
Chet Haase [Thu, 4 Nov 2010 00:44:33 +0000 (17:44 -0700)]
Merge "Updated to the new optimized keyframe APIs"
Chet Haase [Sat, 23 Oct 2010 15:54:43 +0000 (08:54 -0700)]
Updated to the new optimized keyframe APIs
Also fixed some existing bugs in some of the animation apps
Change-Id: Iff39a8396f8c49e2db8601b04012a0bb784a78ed
Alexander Lucas [Wed, 3 Nov 2010 22:35:24 +0000 (15:35 -0700)]
am
48cc36d9: Merge "Added SIP Demo to sample apps." into gingerbread
* commit '
48cc36d936ea132665c35a1f8c9a2b4b9207ec0b':
Added SIP Demo to sample apps.
Alexander Lucas [Wed, 3 Nov 2010 22:32:48 +0000 (15:32 -0700)]
Merge "Added SIP Demo to sample apps." into gingerbread
Alexander Lucas [Wed, 3 Nov 2010 04:50:45 +0000 (21:50 -0700)]
Added SIP Demo to sample apps.
Change-Id: Id98b6e542e1be5b9822a696936e735406c08500f
Dirk Dougherty [Wed, 3 Nov 2010 20:16:40 +0000 (13:16 -0700)]
am
9c92ae92: am
49fe761d: Merge "Cherry pick from master: Sample app and test package for a Service" into gingerbread
* commit '
9c92ae922c1ef17caac6b39db1cd29a89865df56':
Cherry pick from master: Sample app and test package for a Service
Dirk Dougherty [Wed, 3 Nov 2010 20:13:33 +0000 (13:13 -0700)]
am
49fe761d: Merge "Cherry pick from master: Sample app and test package for a Service" into gingerbread
* commit '
49fe761ddcf779f1913d22706a2a6153b80aa397':
Cherry pick from master: Sample app and test package for a Service
Dirk Dougherty [Wed, 3 Nov 2010 20:12:11 +0000 (13:12 -0700)]
Merge "Cherry pick from master: Sample app and test package for a Service" into gingerbread
OSDN Git Service
