OSDN Git Service
Steve Block [Wed, 8 Jun 2011 15:26:13 +0000 (08:26 -0700)]
Merge "Merge WebKit at r82507: Update useragent string"
satok [Wed, 8 Jun 2011 11:09:21 +0000 (04:09 -0700)]
Merge "Fix the display name of InputMethodSubtype"
Narayan Kamath [Wed, 8 Jun 2011 09:11:26 +0000 (02:11 -0700)]
Merge "Fix the threading behaviour of TTS audio requests."
Svetoslav Ganov [Wed, 8 Jun 2011 02:29:20 +0000 (19:29 -0700)]
Merge "Crash in the TouchExplorer"
Jesse Wilson [Wed, 8 Jun 2011 01:49:32 +0000 (18:49 -0700)]
Merge "Use external/mockwebserver in frameworks/base"
Chia-chi Yeh [Wed, 8 Jun 2011 01:18:56 +0000 (18:18 -0700)]
Merge "Do not register the callbacks in the constructor."
Adam Powell [Wed, 8 Jun 2011 01:16:00 +0000 (18:16 -0700)]
resolved conflicts for merge of
a7d01a75 to master
Change-Id: Ib6a7bbca7711cb5e35085868c4b9b5cbb9b526a4
Wink Saville [Wed, 8 Jun 2011 00:54:25 +0000 (17:54 -0700)]
am
7f13d0ed: am
c368831d: Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE
* commit '
7f13d0ed408c3ddce5b061c4370d99ba15d027b7':
Preferred network discrepancy after rild is restarted.
Robert Greenwalt [Wed, 8 Jun 2011 00:54:17 +0000 (17:54 -0700)]
am
31ced5c1: am
350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTE
* commit '
31ced5c140cae9b3ad90066a540346acd821a3c9':
Fix NPE in the statusbar.
Jaikumar Ganesh [Wed, 8 Jun 2011 00:53:41 +0000 (17:53 -0700)]
am
6aa152a1: (-s ours) am
c8410017: (-s ours) am
1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread
* commit '
6aa152a1df3f77b5838a62194fc196e04d8a5c6a':
Remove discoverable timeout handler. DO NOT MERGE
Jeff Brown [Wed, 8 Jun 2011 00:52:53 +0000 (17:52 -0700)]
am
e046555b: am
fd324486: am
5cb05eea: Merge "Fix build." into honeycomb-mr2
* commit '
e046555b4d92179327d12d888be967fff5c027ca':
Fix build.
Jeff Brown [Wed, 8 Jun 2011 00:52:30 +0000 (17:52 -0700)]
am
61220e88: am
bbbab26e: am
2c180499: Merge "Revert velocity damping. Bug:
4364920" into honeycomb-mr2
* commit '
61220e880ac4d9d76b7fd50744439e68e929c697':
Revert velocity damping. Bug:
4364920
Jeff Brown [Wed, 8 Jun 2011 00:52:22 +0000 (17:52 -0700)]
am
55cc25c1: am
797dc698: am
b92dcf9c: Merge "Simplify spot tracking logic. Bug:
4124987" into honeycomb-mr2
* commit '
55cc25c12c45e8ffb65d2275cc0b6941b68db9df':
Simplify spot tracking logic. Bug:
4124987
Jeff Brown [Wed, 8 Jun 2011 00:48:39 +0000 (17:48 -0700)]
resolved conflicts for merge of
8b2c0014 to master
Change-Id: I33a5a2949dc6c2d09e8196ba8c7128caa7ac2361
Irfan Sheriff [Wed, 8 Jun 2011 00:19:02 +0000 (17:19 -0700)]
am
5e4d0206: am
b400184a: Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE
* commit '
5e4d0206486378ffc7d2992750e439d54df15147':
Handle AsyncChannel disconnect in WifiService
Jeff Brown [Wed, 8 Jun 2011 00:18:48 +0000 (17:18 -0700)]
am
c3709f25: am
277bfd7c: am
c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2
* commit '
c3709f2509bfc15d13a590b8342503f858ee67e2':
Improve browser scrolling when using the mouse wheel.
Dianne Hackborn [Wed, 8 Jun 2011 00:18:16 +0000 (17:18 -0700)]
am
4bd50588: am
fc3fa5dc: am
1b405592: Merge "Fix issue #
4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2
* commit '
4bd505883df3d8ca7583d854f1c71302c615519d':
Fix issue #
4539687: At least one compatibility-mode app (Androminion)...
Xavier Ducrohet [Wed, 8 Jun 2011 00:17:11 +0000 (17:17 -0700)]
am
abc83871: am
f6e47999: am
2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2
* commit '
abc838716816107754ab0479242d03807ce79fc2':
Import the Layoutlib from hc-mr1.
Brian Carlstrom [Tue, 7 Jun 2011 22:57:29 +0000 (15:57 -0700)]
Merge "Change KeyChain to assume PEM encoded keystore entries"
Frank Sposaro [Tue, 7 Jun 2011 22:57:11 +0000 (15:57 -0700)]
Merge "Fixed typo. "a a" -> "a""
Christopher Tate [Tue, 7 Jun 2011 22:37:08 +0000 (15:37 -0700)]
Merge "Don't ack/nak backup redundantly at exit"
Christopher Tate [Tue, 7 Jun 2011 22:20:34 +0000 (15:20 -0700)]
Merge "Fix embedded spaces in tar stream EVEN HARDER"
Irfan Sheriff [Tue, 7 Jun 2011 22:16:00 +0000 (15:16 -0700)]
Merge "Update walled garden detection logic"
Amith Yamasani [Tue, 7 Jun 2011 21:48:50 +0000 (14:48 -0700)]
Merge "Volume Panel sizing for phones."
Yu Shan Emily Lau [Tue, 7 Jun 2011 20:40:04 +0000 (13:40 -0700)]
Merge "Cleaned up the old test cases and test media files."
Daniel Sandler [Tue, 7 Jun 2011 20:37:08 +0000 (13:37 -0700)]
Merge "Experimental compatibility mode UI."
Christopher Tate [Tue, 7 Jun 2011 20:17:17 +0000 (13:17 -0700)]
Fix embedded spaces in tar stream EVEN HARDER
Change-Id: I97ac586ff3541a05d73e1e53f680517c15e6c662
Mike Lockwood [Tue, 7 Jun 2011 19:44:52 +0000 (12:44 -0700)]
Merge "StorageVolume: Add allowMassStorage flag"
Christopher Tate [Tue, 7 Jun 2011 19:25:06 +0000 (12:25 -0700)]
Merge "Implement shared-storage full backup/restore"
Alon Albert [Tue, 7 Jun 2011 19:16:28 +0000 (12:16 -0700)]
Merge "Add columns: Events.lastSynced: flag marking this as a duplicate of the lastSynced sate of the event Events.sync_data7: General purpose sync column (will be used for editUrl in Google Sync Adapter) Calendars.canPartiallyUpdate: Flag indicating sync adapter can perform partial updates."
Christopher Tate [Thu, 2 Jun 2011 22:08:13 +0000 (15:08 -0700)]
Implement shared-storage full backup/restore
Every available shared-storage volume is backed up, tagged with its
ordinal in the set of mounted shared volumes. This is an approximation
of "internal + the external card". This lets us restore things to the
same volume [or "equivalent" volume, in the case of a cross-model
restore] as they originated on.
Also fixed a bug in the handling of files/dirs with spaces in
their names.
Change-Id: I380019da8d0bb5b3699bd7c11eeff621a88e78c3
Adam Powell [Tue, 7 Jun 2011 18:36:32 +0000 (11:36 -0700)]
am
212d15c7: am
a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
* commit '
212d15c746f2611339026c16e5fa1aeb7f9090b7':
Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
Adam Powell [Tue, 7 Jun 2011 18:32:23 +0000 (11:32 -0700)]
am
a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
* commit '
a476813dccec241632810c1cbb11bcfbf17841b0':
Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
Mike Lockwood [Tue, 7 Jun 2011 18:25:27 +0000 (11:25 -0700)]
Merge "Add comment for deprecation of Intent.ACTION_UMS_CONNECTED and ACTION_UMS_DISCONNECTED"
Mathias Agopian [Tue, 7 Jun 2011 18:15:01 +0000 (11:15 -0700)]
am
cf3036eb: (-s ours) am
c1cbf452: am
24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
* commit '
cf3036ebef2929f84bc4e34ed1e9d96eefd6a5e7':
merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
Wink Saville [Tue, 7 Jun 2011 18:03:25 +0000 (11:03 -0700)]
am
c368831d: Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE
* commit '
c368831d62ce68d6c9c83d7e49e5db11c47ebd85':
Preferred network discrepancy after rild is restarted.
Mike Lockwood [Tue, 7 Jun 2011 18:02:58 +0000 (11:02 -0700)]
Merge "Deprecate Intent.ACTION_UMS_CONNECTED and Intent.ACTION_UMS_DISCONNECTED"
Robert Greenwalt [Tue, 7 Jun 2011 18:01:23 +0000 (11:01 -0700)]
am
350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTE
* commit '
350b78291de725a1607395055b6d28655d9e1080':
Fix NPE in the statusbar.
Wink Saville [Tue, 7 Jun 2011 17:58:09 +0000 (10:58 -0700)]
Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE
Robert Greenwalt [Tue, 7 Jun 2011 17:57:20 +0000 (10:57 -0700)]
Merge "Fix NPE in the statusbar." into honeycomb-LTE
Jaikumar Ganesh [Tue, 7 Jun 2011 17:01:28 +0000 (10:01 -0700)]
am
c8410017: (-s ours) am
1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread
* commit '
c8410017502dacff43ecd3e0926049b99fc186a8':
Remove discoverable timeout handler. DO NOT MERGE
Wu-cheng Li [Tue, 7 Jun 2011 11:05:35 +0000 (04:05 -0700)]
Merge "Improve android.hardware.Camera.Area javadoc."
Xia Wang [Tue, 7 Jun 2011 05:00:31 +0000 (22:00 -0700)]
Merge "Add OpenGl benchmark tests: display images with different texture in each mesh."
Jeff Brown [Tue, 7 Jun 2011 04:11:44 +0000 (21:11 -0700)]
am
fd324486: am
5cb05eea: Merge "Fix build." into honeycomb-mr2
* commit '
fd3244868dec40707039cd616dd37ada41774547':
Fix build.
Jeff Brown [Tue, 7 Jun 2011 04:08:25 +0000 (21:08 -0700)]
am
5cb05eea: Merge "Fix build." into honeycomb-mr2
* commit '
5cb05eea289559b30cf4f84130cb6afba0921638':
Fix build.
Jeff Brown [Tue, 7 Jun 2011 04:06:30 +0000 (21:06 -0700)]
Merge "Fix build." into honeycomb-mr2
Jeff Brown [Tue, 7 Jun 2011 03:36:49 +0000 (20:36 -0700)]
am
bbbab26e: am
2c180499: Merge "Revert velocity damping. Bug:
4364920" into honeycomb-mr2
* commit '
bbbab26ebe9bc789ba9abac757895a6c31de7cc5':
Revert velocity damping. Bug:
4364920
Jeff Brown [Tue, 7 Jun 2011 03:36:41 +0000 (20:36 -0700)]
am
797dc698: am
b92dcf9c: Merge "Simplify spot tracking logic. Bug:
4124987" into honeycomb-mr2
* commit '
797dc698e9ff85c1a09874cc3f7bfe825b2ff0e1':
Simplify spot tracking logic. Bug:
4124987
Jeff Brown [Tue, 7 Jun 2011 03:34:38 +0000 (20:34 -0700)]
am
b3536145: am
ed48fa89: Merge "Touch pad improvements. Bug:
4124987" into honeycomb-mr2
* commit '
b3536145725250401d25ffa00cda85d222dfc21e':
Touch pad improvements. Bug:
4124987
Irfan Sheriff [Tue, 7 Jun 2011 03:34:35 +0000 (20:34 -0700)]
am
b400184a: Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE
* commit '
b400184ad6277676048a30b042ed0667de662ad8':
Handle AsyncChannel disconnect in WifiService
Jeff Brown [Tue, 7 Jun 2011 03:34:35 +0000 (20:34 -0700)]
am
2c180499: Merge "Revert velocity damping. Bug:
4364920" into honeycomb-mr2
* commit '
2c1804998b6a3f1f9f5f301ccf813363825ab4cf':
Revert velocity damping. Bug:
4364920
Jeff Brown [Tue, 7 Jun 2011 03:34:33 +0000 (20:34 -0700)]
am
b92dcf9c: Merge "Simplify spot tracking logic. Bug:
4124987" into honeycomb-mr2
* commit '
b92dcf9c062064dcca9298b089d95a3ce1ba2e75':
Simplify spot tracking logic. Bug:
4124987
Jeff Brown [Tue, 7 Jun 2011 03:32:25 +0000 (20:32 -0700)]
am
ed48fa89: Merge "Touch pad improvements. Bug:
4124987" into honeycomb-mr2
* commit '
ed48fa89a8e31b04681347a9235c2a566e7dbb8e':
Touch pad improvements. Bug:
4124987
Jeff Brown [Tue, 7 Jun 2011 03:32:18 +0000 (20:32 -0700)]
Merge "Revert velocity damping. Bug:
4364920" into honeycomb-mr2
Jeff Brown [Tue, 7 Jun 2011 03:32:02 +0000 (20:32 -0700)]
am
277bfd7c: am
c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2
* commit '
277bfd7cdd889e4f59e57925b90d1899f7312c4e':
Improve browser scrolling when using the mouse wheel.
Irfan Sheriff [Tue, 7 Jun 2011 03:31:55 +0000 (20:31 -0700)]
Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE
Jeff Brown [Tue, 7 Jun 2011 03:31:55 +0000 (20:31 -0700)]
Merge "Simplify spot tracking logic. Bug:
4124987" into honeycomb-mr2
Jeff Brown [Tue, 7 Jun 2011 03:30:47 +0000 (20:30 -0700)]
Merge "Touch pad improvements. Bug:
4124987" into honeycomb-mr2
Jeff Brown [Tue, 7 Jun 2011 03:29:08 +0000 (20:29 -0700)]
am
c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2
* commit '
c1830a77a7fe0f1ccd52f405cb076d40fe085e2f':
Improve browser scrolling when using the mouse wheel.
Jeff Brown [Tue, 7 Jun 2011 03:27:28 +0000 (20:27 -0700)]
Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2
Jeff Brown [Tue, 7 Jun 2011 03:23:54 +0000 (20:23 -0700)]
Revert velocity damping.
Bug:
4364920
Velocity damping proved to be a bad idea because it would
cause a significant ramp in velocity at the beginning of
a gesture, instead of the desired smooth behavior. Oh well.
Change-Id: Ie631946f47ef2492bd71fbed1ab44bbb39a875a8
Dianne Hackborn [Tue, 7 Jun 2011 02:01:48 +0000 (19:01 -0700)]
Merge "Add force-stop subcommand for 'am'."
Dianne Hackborn [Tue, 7 Jun 2011 01:18:34 +0000 (18:18 -0700)]
am
fc3fa5dc: am
1b405592: Merge "Fix issue #
4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2
* commit '
fc3fa5dc1045a8f25fc1982443e05873edf028df':
Fix issue #
4539687: At least one compatibility-mode app (Androminion)...
Xavier Ducrohet [Tue, 7 Jun 2011 01:11:33 +0000 (18:11 -0700)]
am
f6e47999: am
2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2
* commit '
f6e479993e7c85265692829990ceb3879fbce424':
Import the Layoutlib from hc-mr1.
Dianne Hackborn [Tue, 7 Jun 2011 00:33:59 +0000 (17:33 -0700)]
am
1b405592: Merge "Fix issue #
4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2
* commit '
1b405592550c719aa5dd93178705ae08b4e84a2f':
Fix issue #
4539687: At least one compatibility-mode app (Androminion)...
Dianne Hackborn [Tue, 7 Jun 2011 00:30:50 +0000 (17:30 -0700)]
Merge "Fix issue #
4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2
Fabrice Di Meglio [Mon, 6 Jun 2011 23:48:30 +0000 (16:48 -0700)]
Merge "Rename Gravity BEFORE/AFTER to START/END"
Eric Fischer [Mon, 6 Jun 2011 23:22:35 +0000 (16:22 -0700)]
Merge "Import revised translations."
Xavier Ducrohet [Mon, 6 Jun 2011 23:20:16 +0000 (16:20 -0700)]
am
2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2
* commit '
2a6dc7f19d463c7c9f7aacd12eca5263afd25a90':
Import the Layoutlib from hc-mr1.
Xavier Ducrohet [Mon, 6 Jun 2011 23:17:44 +0000 (16:17 -0700)]
Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2
James Dong [Mon, 6 Jun 2011 22:54:10 +0000 (15:54 -0700)]
Merge "Fix the comment for the location box @xyz"
Ben Komalo [Mon, 6 Jun 2011 22:50:10 +0000 (15:50 -0700)]
Merge "Makes SSLCertificateSocketFactory more flexible"
Mathias Agopian [Mon, 6 Jun 2011 22:25:32 +0000 (15:25 -0700)]
am
c1cbf452: am
24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
* commit '
c1cbf4525b4d12b6cb7908072d36c8f6ca819f5b':
merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
Mathias Agopian [Mon, 6 Jun 2011 22:21:44 +0000 (15:21 -0700)]
am
24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
* commit '
24855c09173a6caaec7dcedd0c2d7ce15121d39b':
merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
Mathias Agopian [Mon, 6 Jun 2011 16:55:15 +0000 (09:55 -0700)]
merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
Fix a race that could cause GL commands to be executed from the wrong thread.
RefBase subclasses can now decide how they want to be destroyed.
Fix a race in SurfaceFlinger that could cause layers to be leaked forever.
Fix a race-condtion in SurfaceFlinger that could lead to a crash.
initial cherry-pick:
resolved conflicts for merge of
b9783b49 to honeycomb-plus-aosp
Change-Id: I2a335e03fff219e35c18a7b0089b3a11d636576f
Fabrice Di Meglio [Mon, 6 Jun 2011 21:14:36 +0000 (14:14 -0700)]
Merge "Fix USE_TEXT_LAYOUT_CACHE define"
Martijn Coenen [Mon, 6 Jun 2011 20:46:47 +0000 (13:46 -0700)]
Merge "Connecting to a NFC technology may fail."
Jeff Brown [Mon, 6 Jun 2011 20:14:13 +0000 (13:14 -0700)]
Merge "Copy pointer assets for hdpi."
Nick Pelly [Mon, 6 Jun 2011 19:57:32 +0000 (12:57 -0700)]
am
92279c0f: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
* commit '
92279c0fa1c15bd4afaf051bed90776fa64744c1':
TK MUN [Mon, 6 Jun 2011 19:57:24 +0000 (12:57 -0700)]
am
51704fc9: am
cecb710a: am
94260caf: Allow control over search order for tethering upstream interface selection
* commit '
51704fc9c2f42e72a86f580c3e2aa977e8b6b006':
Allow control over search order for tethering upstream interface selection
Eric Fischer [Mon, 6 Jun 2011 19:57:14 +0000 (12:57 -0700)]
am
e34ed24f: (-s ours) am
e9d32283: am
b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
e34ed24f4d32ad20716caf3056a7b007a0277500':
Import revised translations. DO NOT MERGE
Jaikumar Ganesh [Mon, 6 Jun 2011 19:56:55 +0000 (12:56 -0700)]
am
5aaed097: am
58ada2f3: am
94062517: Merge "Require bonding and encryption for PBAP server"
* commit '
5aaed0970be451479a07b2423e709026dec6611b':
Require bonding and encryption for PBAP server
Jean-Baptiste Queru [Mon, 6 Jun 2011 19:56:29 +0000 (12:56 -0700)]
am
59242cf6: am
54ab72e1: am
038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format."
* commit '
59242cf65ec775ccb6cb3639df4eab6af09f3108':
Adding support for parsing of SMS-CB pdus in UMTS format.
Marco Nelissen [Mon, 6 Jun 2011 19:33:40 +0000 (12:33 -0700)]
Merge "resolved conflicts for merge of
b2fd84ad to master"
Marco Nelissen [Mon, 6 Jun 2011 19:30:40 +0000 (12:30 -0700)]
resolved conflicts for merge of
b2fd84ad to master
Change-Id: I36b8dba94386981e95abbb0ac8db5e84cce56fb9
Nick Pelly [Mon, 6 Jun 2011 18:52:21 +0000 (11:52 -0700)]
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
TK MUN [Mon, 6 Jun 2011 18:51:22 +0000 (11:51 -0700)]
am
cecb710a: am
94260caf: Allow control over search order for tethering upstream interface selection
* commit '
cecb710a6de249a3847da2f07464a1aecf9459ac':
Allow control over search order for tethering upstream interface selection
Eric Fischer [Mon, 6 Jun 2011 18:50:16 +0000 (11:50 -0700)]
am
e9d32283: am
b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
e9d32283e4eca1ee27218ed66f754a694678ac6d':
Import revised translations. DO NOT MERGE
RoboErik [Mon, 6 Jun 2011 18:39:40 +0000 (11:39 -0700)]
Merge "Cleanup of Calendar.java to prep for api"
Jaikumar Ganesh [Mon, 6 Jun 2011 18:34:11 +0000 (11:34 -0700)]
am
58ada2f3: am
94062517: Merge "Require bonding and encryption for PBAP server"
* commit '
58ada2f3bbab749fb5a813fb8f82eee347080405':
Require bonding and encryption for PBAP server
Jean-Baptiste Queru [Mon, 6 Jun 2011 18:33:52 +0000 (11:33 -0700)]
am
54ab72e1: am
038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format."
* commit '
54ab72e1c389905adb074bd7c799a33b4f513679':
Adding support for parsing of SMS-CB pdus in UMTS format.
Eric Fischer [Mon, 6 Jun 2011 17:54:41 +0000 (10:54 -0700)]
am
b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
b16b020dd32147fbaaf7de47d5de16bfee10967a':
Import revised translations. DO NOT MERGE
Alex Sakhartchouk [Mon, 6 Jun 2011 17:54:26 +0000 (10:54 -0700)]
Merge "Unhiding render target code for renderscript"
Eric Fischer [Mon, 6 Jun 2011 17:38:42 +0000 (10:38 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
Marco Nelissen [Mon, 6 Jun 2011 16:55:15 +0000 (09:55 -0700)]
resolved conflicts for merge of
b9783b49 to honeycomb-plus-aosp
Change-Id: I1d86ea56b3d1d1b69f6671e5b0df0ca3f0c79643
John Reck [Mon, 6 Jun 2011 16:25:44 +0000 (09:25 -0700)]
Merge "Delay set picture if necessary"
Glenn Kasten [Mon, 6 Jun 2011 16:12:05 +0000 (09:12 -0700)]
Merge "Remove dead code related to gettid"
Marco Nelissen [Mon, 6 Jun 2011 15:21:07 +0000 (08:21 -0700)]
Merge "Add WebP Mime-Type support in Android Media File"
Shih-wei Liao [Sun, 5 Jun 2011 07:58:40 +0000 (00:58 -0700)]
Merge "Fix the false-alarm bug when we skip to the end, which should be OK."
Wink Saville [Sat, 4 Jun 2011 15:19:00 +0000 (08:19 -0700)]
Merge "resolved conflict for merge of
fc51aaec to master"
OSDN Git Service
