OSDN Git Service
Brad Fitzpatrick [Tue, 29 Mar 2011 15:55:02 +0000 (08:55 -0700)]
Merge "Error in compound cache-control header."
Brad Fitzpatrick [Mon, 28 Mar 2011 15:13:08 +0000 (08:13 -0700)]
Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"
Brad Fitzpatrick [Mon, 28 Mar 2011 14:59:08 +0000 (07:59 -0700)]
Merge "Unregister callback from binder when vibration is removed"
Brad Fitzpatrick [Wed, 23 Mar 2011 19:33:39 +0000 (12:33 -0700)]
Merge "Making it possible to call SIP calls with special allowed chars."
Brad Fitzpatrick [Wed, 23 Mar 2011 19:30:28 +0000 (12:30 -0700)]
Merge "Fixing the wrong link in YuvImage JavaDoc."
Brad Fitzpatrick [Thu, 17 Mar 2011 16:51:47 +0000 (09:51 -0700)]
Merge "Removing dead store; it was likely a relict of debuging code."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:23:44 +0000 (11:23 -0700)]
Merge "Releasing lock even if exception is thrown."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:22:43 +0000 (11:22 -0700)]
Merge "Lazy initialization must be synchronized to avoid parallel instances cretation."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:19:23 +0000 (11:19 -0700)]
Merge "Removing self-assignment statement."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:18:18 +0000 (11:18 -0700)]
Merge "Fixing self-assignment in copying code."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:15:19 +0000 (11:15 -0700)]
Merge "Fixing self-assignment in cloning code."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:13:01 +0000 (11:13 -0700)]
Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:12:15 +0000 (11:12 -0700)]
Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:03:29 +0000 (11:03 -0700)]
Merge "Fixing improper boxing to Integer instead of Long."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:00:51 +0000 (11:00 -0700)]
Merge "Using proper key for removing object from the map."
Brad Fitzpatrick [Tue, 15 Mar 2011 17:56:16 +0000 (10:56 -0700)]
Merge changes I81fc2f90,I5e7fd759
* changes:
Using proper key for removing from map.
Removing wrong equals method in comparator.
Kenny Root [Fri, 11 Mar 2011 22:22:22 +0000 (14:22 -0800)]
Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"
Dianne Hackborn [Tue, 1 Mar 2011 02:03:12 +0000 (18:03 -0800)]
am
62619392: Merge "Fix leak when keylock is recreated."
* commit '
626193926df0b3c7236e5c244f30d797d9192e0d':
Fix leak when keylock is recreated.
Dianne Hackborn [Tue, 1 Mar 2011 01:54:54 +0000 (17:54 -0800)]
Merge "Fix leak when keylock is recreated."
Jaikumar Ganesh [Tue, 1 Mar 2011 00:00:01 +0000 (16:00 -0800)]
am
1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT."
* commit '
1eefb529c78be5336f6c8a1b8ac2c32e268d4294':
Phone crash when old callback func is woken up when enabling BT.
Jaikumar Ganesh [Mon, 28 Feb 2011 23:33:34 +0000 (15:33 -0800)]
Merge "Phone crash when old callback func is woken up when enabling BT."
Jean-Baptiste Queru [Mon, 28 Feb 2011 18:15:46 +0000 (10:15 -0800)]
am
e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase."
* commit '
e0537f1859664ba9c9cf87eb9d6dc3c16986dbb8':
Fix of tearDown() in SingleLaunchActivityTestCase.
Jean-Baptiste Queru [Mon, 28 Feb 2011 18:12:08 +0000 (10:12 -0800)]
Merge "Fix of tearDown() in SingleLaunchActivityTestCase."
Xavier Ducrohet [Mon, 28 Feb 2011 17:16:38 +0000 (09:16 -0800)]
am
dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit '
dff6b8e71dda9f5d841fa26408714aec2aef1505':
GpsLocationProvider: Clean up HAL initialization/cleanup sequence
Fixed GSM encoded network initiated position request
Ensuring thread-safe usage of DateFormat.
Fixing infinite loop for zero duration.
Fix for an infinite loop while scrolling lists.
WAPPushManager, WAP Push over SMS message handler
Add --non-constant-id to aapt.
Xavier Ducrohet [Thu, 24 Feb 2011 23:59:26 +0000 (15:59 -0800)]
Merge "Add --non-constant-id to aapt."
Wink Saville [Thu, 24 Feb 2011 01:40:43 +0000 (17:40 -0800)]
Merge "WAPPushManager, WAP Push over SMS message handler"
Mike Lockwood [Thu, 24 Feb 2011 00:27:27 +0000 (16:27 -0800)]
Merge "GpsLocationProvider: Clean up HAL initialization/cleanup sequence"
Brad Fitzpatrick [Wed, 23 Feb 2011 16:17:31 +0000 (08:17 -0800)]
Merge "Fixed GSM encoded network initiated position request"
Elliott Hughes [Tue, 22 Feb 2011 19:16:04 +0000 (11:16 -0800)]
Merge "Ensuring thread-safe usage of DateFormat."
Brad Fitzpatrick [Tue, 22 Feb 2011 18:55:44 +0000 (10:55 -0800)]
Merge "Fix for an infinite loop while scrolling lists."
Brad Fitzpatrick [Tue, 22 Feb 2011 16:23:23 +0000 (08:23 -0800)]
Merge "Fixing infinite loop for zero duration."
Romain Guy [Fri, 18 Feb 2011 15:53:50 +0000 (07:53 -0800)]
am
7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw."
* commit '
7118bdec523568842e70555e353951df9f2596fd':
Fix for #12945: ProgressBar.setMax() will always redraw.
Romain Guy [Fri, 18 Feb 2011 06:40:33 +0000 (22:40 -0800)]
Merge "Fix for #12945: ProgressBar.setMax() will always redraw."
Robert Ly [Fri, 11 Feb 2011 21:18:31 +0000 (13:18 -0800)]
am
322891c6: Doc change: nfc dev guide
* commit '
322891c689c845b5aa63dbca606967eb9f8f900b':
Doc change: nfc dev guide
Jean-Baptiste Queru [Fri, 11 Feb 2011 18:04:53 +0000 (10:04 -0800)]
Jean-Baptiste Queru [Fri, 11 Feb 2011 17:54:59 +0000 (09:54 -0800)]
Jean-Baptiste Queru [Fri, 11 Feb 2011 17:39:46 +0000 (09:39 -0800)]
Merge "stubs"
Steve Block [Fri, 11 Feb 2011 00:04:48 +0000 (16:04 -0800)]
stubs
Change-Id: I6bc0b8e9d4412a0b60c6226fbd2b7a6d15aceb22
Gilles Debunne [Thu, 10 Feb 2011 00:49:42 +0000 (16:49 -0800)]
am
2050de5b: Text selection is broken.
* commit '
2050de5b9a5c097e30545ab822211d49031bd9dc':
Text selection is broken.
Wink Saville [Wed, 9 Feb 2011 21:45:37 +0000 (13:45 -0800)]
am
01a5eba8: am
6e25789f: Merge "Telephony: Fix cb sms implementation"
* commit '
01a5eba810bfdf5b111a7546814e174c1d57b6e7':
Telephony: Fix cb sms implementation
Wink Saville [Wed, 9 Feb 2011 21:42:45 +0000 (13:42 -0800)]
am
6e25789f: Merge "Telephony: Fix cb sms implementation"
* commit '
6e25789fbe7ac283021156b17f406acb48850292':
Telephony: Fix cb sms implementation
Wink Saville [Wed, 9 Feb 2011 21:09:24 +0000 (13:09 -0800)]
Merge "Telephony: Fix cb sms implementation"
Mathias Agopian [Wed, 9 Feb 2011 21:09:12 +0000 (13:09 -0800)]
am
ada1b6f2: Merge "fix [
3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
* commit '
ada1b6f297596cac4451edbc83df060a31cdda68':
fix [
3421350] Killing a game that uses the accelerometer renders the device unable to sleep
Mathias Agopian [Wed, 9 Feb 2011 21:06:00 +0000 (13:06 -0800)]
Merge "fix [
3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
Scott Main [Wed, 9 Feb 2011 21:03:11 +0000 (13:03 -0800)]
am
07cefd3c: add 2.3.3 announcement to site home page
* commit '
07cefd3cc3d8d27750e4fc725d9aec86250750dd':
add 2.3.3 announcement to site home page
Jeff Hamilton [Wed, 9 Feb 2011 08:36:53 +0000 (00:36 -0800)]
am
58c9d472: Merge "More documentation updates for NFC." into gingerbread
* commit '
58c9d4726ebf3165b0dbbcebb1130dfc5502bfe9':
More documentation updates for NFC.
Jeff Hamilton [Wed, 9 Feb 2011 08:34:22 +0000 (00:34 -0800)]
Merge "More documentation updates for NFC." into gingerbread
Dirk Dougherty [Wed, 9 Feb 2011 07:27:53 +0000 (23:27 -0800)]
am
a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
* commit '
a3f53afd13bc1722464e169cb82a01d3898852b5':
Doc change: Add version notes for Android 2.3.3.
Nick Pelly [Wed, 9 Feb 2011 07:25:29 +0000 (23:25 -0800)]
am
39cf3a44: Document NFC permissions.
* commit '
39cf3a445e507f219ecc8a476f6038f095d9d520':
Document NFC permissions.
Dirk Dougherty [Wed, 9 Feb 2011 07:24:22 +0000 (23:24 -0800)]
Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
Jeff Hamilton [Wed, 9 Feb 2011 03:33:53 +0000 (19:33 -0800)]
am
584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread
* commit '
584afa8dde1777b181e773a491416769f25607a8':
Improve the docs a bit for foreground dispatch.
Jeff Hamilton [Wed, 9 Feb 2011 03:30:47 +0000 (19:30 -0800)]
Merge "Improve the docs a bit for foreground dispatch." into gingerbread
Eric Fischer [Wed, 9 Feb 2011 01:32:18 +0000 (17:32 -0800)]
am
be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
be4b39d2fde3d34539752b99238ceebd97ccf580':
Import revised translations. DO NOT MERGE
Scott Main [Wed, 9 Feb 2011 01:32:14 +0000 (17:32 -0800)]
am
3c01a139: rename SIP doc title
* commit '
3c01a139f0d8ece0e300be26ac41280f1e934747':
rename SIP doc title
Scott Main [Wed, 9 Feb 2011 01:32:06 +0000 (17:32 -0800)]
am
c442bc60: docs: move the SIP guide into guide/network/
* commit '
c442bc605c80a2900a0ed41345f53d218288de7a':
docs: move the SIP guide into guide/network/
Katie McCormick [Wed, 9 Feb 2011 01:31:59 +0000 (17:31 -0800)]
am
7134520b: cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
* commit '
7134520b2635474c5e7f4902c26e12d0ffcc9c64':
cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
Dirk Dougherty [Wed, 9 Feb 2011 01:31:54 +0000 (17:31 -0800)]
am
01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread
* commit '
01967c0ee104e985167374e41f2c416c1100f767':
Doc change: Add diff report for api 10.
Gilles Debunne [Wed, 9 Feb 2011 01:31:33 +0000 (17:31 -0800)]
am
cdfe8999: Fix for multiple merge problem.
* commit '
cdfe899991c365d9e197d83f8859089cae082011':
Fix for multiple merge problem.
Gilles Debunne [Wed, 9 Feb 2011 00:33:58 +0000 (16:33 -0800)]
resolved conflicts for merge of
c0728cc0 to gingerbread-plus-aosp
Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986
Eric Fischer [Tue, 8 Feb 2011 18:00:24 +0000 (10:00 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Dirk Dougherty [Tue, 8 Feb 2011 01:21:56 +0000 (17:21 -0800)]
Merge "Doc change: Add diff report for api 10." into gingerbread
Brad Fitzpatrick [Mon, 7 Feb 2011 18:07:46 +0000 (10:07 -0800)]
am
b901c9ab: am
9204644d: Merge "Fix a race condition in NativeDaemonConnector"
* commit '
b901c9abff6b3885e1efce2e643b1f8e5ef3fc79':
Fix a race condition in NativeDaemonConnector
Brad Fitzpatrick [Mon, 7 Feb 2011 18:04:54 +0000 (10:04 -0800)]
am
9204644d: Merge "Fix a race condition in NativeDaemonConnector"
* commit '
9204644d9e8fc2a3d05ff386b14b349f7a117694':
Fix a race condition in NativeDaemonConnector
Brad Fitzpatrick [Mon, 7 Feb 2011 17:55:34 +0000 (09:55 -0800)]
Merge "Fix a race condition in NativeDaemonConnector"
Dianne Hackborn [Mon, 7 Feb 2011 15:51:34 +0000 (07:51 -0800)]
am
4b7c1cac: am
bb2e1ef8: Merge "Fixing possible race condition."
* commit '
4b7c1cacca252f735d23f7e01885214630d83f32':
Fixing possible race condition.
Dianne Hackborn [Mon, 7 Feb 2011 15:33:38 +0000 (07:33 -0800)]
am
bb2e1ef8: Merge "Fixing possible race condition."
* commit '
bb2e1ef87fe4c5123340035766c759155e6bb90c':
Fixing possible race condition.
Dianne Hackborn [Sun, 6 Feb 2011 17:06:35 +0000 (09:06 -0800)]
Merge "Fixing possible race condition."
Kenny Root [Sat, 5 Feb 2011 00:12:14 +0000 (16:12 -0800)]
am
d2a99617: am
c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."
* commit '
d2a996173e53e7b38ff9b703cc5986d9715508a1':
JPtextinput: Dont break emoji characters when cutting strings.
Kenny Root [Sat, 5 Feb 2011 00:01:13 +0000 (16:01 -0800)]
am
c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."
* commit '
c94a99987d8a49ea599c22ffad0e61db591963e0':
JPtextinput: Dont break emoji characters when cutting strings.
Gilles Debunne [Fri, 4 Feb 2011 23:50:15 +0000 (15:50 -0800)]
am
893ac28f: Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread
* commit '
893ac28f75561061a8f334cbd4e47833d7fd7843':
Blinking runnable is created only if text is editable. DO NOT MERGE.
Gilles Debunne [Fri, 4 Feb 2011 23:50:12 +0000 (15:50 -0800)]
am
8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread
* commit '
8a6ba494a28702e68b0a8fbd8bac34335536a8f8':
All runnable are stopped on detach. DO NOT MERGE.
Gilles Debunne [Fri, 4 Feb 2011 23:49:56 +0000 (15:49 -0800)]
am
53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
* commit '
53841df2a49bffa53ba3d1e4b0580f4f23a64dc3':
SelectAllOnFocus shows a higlighted text. DO NOT MERGE.
Gilles Debunne [Fri, 4 Feb 2011 23:46:15 +0000 (15:46 -0800)]
Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread
Gilles Debunne [Fri, 4 Feb 2011 23:46:11 +0000 (15:46 -0800)]
Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread
Gilles Debunne [Fri, 4 Feb 2011 23:46:06 +0000 (15:46 -0800)]
Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
Kenny Root [Fri, 4 Feb 2011 23:42:14 +0000 (15:42 -0800)]
Merge "JPtextinput: Dont break emoji characters when cutting strings."
Brad Fitzpatrick [Fri, 4 Feb 2011 18:30:40 +0000 (10:30 -0800)]
am
f664d6f9: am
b083d3b8: Merge "Initialize resampling buffer per track."
* commit '
f664d6f916516860d3e4cf82339d47c6f4fd24a2':
Initialize resampling buffer per track.
Brad Fitzpatrick [Fri, 4 Feb 2011 18:27:54 +0000 (10:27 -0800)]
am
b083d3b8: Merge "Initialize resampling buffer per track."
* commit '
b083d3b816378ef3b9dceb33b2c2e20510b2632b':
Initialize resampling buffer per track.
Brad Fitzpatrick [Fri, 4 Feb 2011 18:19:06 +0000 (10:19 -0800)]
Merge "Initialize resampling buffer per track."
Joe Onorato [Fri, 4 Feb 2011 02:08:45 +0000 (18:08 -0800)]
am
163c28b5: Merge "Managed dialogs should run on the same thread as their activity." into gingerbread
* commit '
163c28b5ca0a85be4c3f64c5419eb95fec4a6d43':
Managed dialogs should run on the same thread as their activity.
Joe Onorato [Fri, 4 Feb 2011 02:05:20 +0000 (18:05 -0800)]
Merge "Managed dialogs should run on the same thread as their activity." into gingerbread
Nick Pelly [Fri, 4 Feb 2011 00:32:29 +0000 (16:32 -0800)]
am
40684946: Merge "Fix docs type that broke build." into gingerbread
* commit '
40684946cb00080c1c7424885f49a809816dd26e':
Fix docs type that broke build.
Nick Pelly [Fri, 4 Feb 2011 00:27:51 +0000 (16:27 -0800)]
Merge "Fix docs type that broke build." into gingerbread
Jean-Baptiste Queru [Fri, 4 Feb 2011 00:21:47 +0000 (16:21 -0800)]
Scott Main [Thu, 3 Feb 2011 23:56:02 +0000 (15:56 -0800)]
am
779f7410: Merge "cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard" into gingerbread
* commit '
779f7410b35267fafb725061d76fc684cd77f26b':
cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard
Nick Pelly [Thu, 3 Feb 2011 23:55:53 +0000 (15:55 -0800)]
am
630ac8df: Merge "NFC documentation overhaul." into gingerbread
* commit '
630ac8df2478cd0d47a90b95fbb13b9de4ad58b1':
NFC documentation overhaul.
Scott Main [Thu, 3 Feb 2011 23:24:40 +0000 (15:24 -0800)]
Merge "cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard" into gingerbread
Jean-Baptiste Queru [Thu, 3 Feb 2011 23:24:24 +0000 (15:24 -0800)]
Nick Pelly [Thu, 3 Feb 2011 23:23:17 +0000 (15:23 -0800)]
Merge "NFC documentation overhaul." into gingerbread
Jean-Baptiste Queru [Thu, 3 Feb 2011 22:25:27 +0000 (14:25 -0800)]
Merge from gingerbread
Change-Id: I6b895012db6b96666dc3257b1f2e430925981188
Jean-Baptiste Queru [Thu, 3 Feb 2011 22:09:34 +0000 (14:09 -0800)]
am
8444023f: Merge from open-source gingerbread
* commit '
8444023f351b22816f6827d3314ff81b3533e3d9':
Fix the Multi-page SMS sending error to several receipents
Jean-Baptiste Queru [Thu, 3 Feb 2011 22:05:14 +0000 (14:05 -0800)]
Merge from open-source gingerbread
Change-Id: I19c4ba36cf4f2ef518b55768360b0bff1a92a5ab
Jean-Baptiste Queru [Thu, 3 Feb 2011 22:02:59 +0000 (14:02 -0800)]
Merge "Fix the Multi-page SMS sending error to several receipents" into gingerbread
Jean-Baptiste Queru [Thu, 3 Feb 2011 21:32:08 +0000 (13:32 -0800)]
Jean-Baptiste Queru [Thu, 3 Feb 2011 21:28:51 +0000 (13:28 -0800)]
am
4b8ad9ef: Merge from gingerbread
* commit '
4b8ad9effd95508e9966b8a3a355f0a948558ae2':
Fix delivery report error with PENDING status in SMS
Jean-Baptiste Queru [Thu, 3 Feb 2011 21:17:49 +0000 (13:17 -0800)]
Merge from gingerbread
Change-Id: Id0509272ef8382fb0004f4d38bbba744e3487a8c
Jean-Baptiste Queru [Thu, 3 Feb 2011 21:03:36 +0000 (13:03 -0800)]
Merge
ee4c17ee from gingerbread
Change-Id: Ide109e517fb7610d60f31ba6aa99fe665b59d690
Jean-Baptiste Queru [Thu, 3 Feb 2011 20:41:49 +0000 (12:41 -0800)]
Merge from open-source gingerbread
Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52
Jean-Baptiste Queru [Thu, 3 Feb 2011 20:17:47 +0000 (12:17 -0800)]
Merge "Fix delivery report error with PENDING status in SMS" into gingerbread
Scott Main [Thu, 3 Feb 2011 02:08:51 +0000 (18:08 -0800)]
am
ca69a634: fix broken links, update the dev guide intro, and update sitemap file
* commit '
ca69a6340610bfd7e830ff9be64a74085aea037c':
fix broken links, update the dev guide intro, and update sitemap file
OSDN Git Service
