OSDN Git Service
Wink Saville [Sat, 26 Mar 2011 15:04:30 +0000 (08:04 -0700)]
Add some debug to apn list creation routines.
Change-Id: Ic5055daefd50b6371f129d82313c533a04cd75b1
Dirk Dougherty [Sat, 26 Mar 2011 02:25:45 +0000 (19:25 -0700)]
am
0b9bacc6: am
085baa2c: Doc change: Fix scale on highlights screen shots.
* commit '
0b9bacc69314fc6480d1ebe67b7ee0d0aebca5c0':
Doc change: Fix scale on highlights screen shots.
Dirk Dougherty [Sat, 26 Mar 2011 02:22:55 +0000 (19:22 -0700)]
am
085baa2c: Doc change: Fix scale on highlights screen shots.
* commit '
085baa2cc3f2d23523377b1df390cec5d3bf1445':
Doc change: Fix scale on highlights screen shots.
Dirk Dougherty [Sat, 26 Mar 2011 02:07:30 +0000 (19:07 -0700)]
Doc change: Fix scale on highlights screen shots.
Change-Id: Id2608498baac70dc69d7b716bbb00f0799af03ca
Andreas Huber [Fri, 25 Mar 2011 22:38:34 +0000 (15:38 -0700)]
am
1457ef74: Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1
* commit '
1457ef74d49ee56097ad97cc078e898326beb7db':
Make sure we post a video event when seeking after seeing video EOS before.
Andreas Huber [Fri, 25 Mar 2011 22:33:58 +0000 (15:33 -0700)]
Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1
Andreas Huber [Fri, 25 Mar 2011 20:03:14 +0000 (13:03 -0700)]
Make sure we post a video event when seeking after seeing video EOS before.
Change-Id: I513bf94c0732a85324160977ea5723d8aafd6aba
related-to-bug:
3316960
Adam Powell [Fri, 25 Mar 2011 21:45:06 +0000 (14:45 -0700)]
am
baa3380d: Fix bug
4170809 - Pages with flash lose touch events
* commit '
baa3380d74928baf6a5685c54c719af37171a625':
Fix bug
4170809 - Pages with flash lose touch events
Adam Powell [Fri, 25 Mar 2011 20:58:19 +0000 (13:58 -0700)]
Fix bug
4170809 - Pages with flash lose touch events
Fix WebView touch cancel behavior when we time out waiting for a
response from webkit.
Change-Id: I0aeeea64b156e204dbe2dda913a42df28704ed16
James Dong [Fri, 25 Mar 2011 17:24:44 +0000 (10:24 -0700)]
am
837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1
* commit '
837430dd3440f6e71f68ef755399e22386dee084':
Switch to use SF cached source
James Dong [Fri, 25 Mar 2011 17:22:57 +0000 (10:22 -0700)]
Merge "Switch to use SF cached source" into honeycomb-mr1
Gloria Wang [Fri, 25 Mar 2011 17:05:50 +0000 (10:05 -0700)]
am
b8b85ea2: Merge "Fix for bug
4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
* commit '
b8b85ea296b09cfc5f986e8ee38b959776050d43':
Fix for bug
4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
Gloria Wang [Fri, 25 Mar 2011 17:01:37 +0000 (10:01 -0700)]
Merge "Fix for bug
4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
James Dong [Fri, 25 Mar 2011 15:41:57 +0000 (08:41 -0700)]
Switch to use SF cached source
bug -
3500025
Change-Id: I96c416d39af498f091d2d52f5923f556382a9c1f
Scott Main [Thu, 24 Mar 2011 21:11:39 +0000 (14:11 -0700)]
am
cc4b6a61: am
4045e6b9: docs: a11y doc typo
* commit '
cc4b6a61c6df67c211ac85d49f457fd562abf142':
docs: a11y doc typo
Scott Main [Thu, 24 Mar 2011 21:00:47 +0000 (14:00 -0700)]
am
4045e6b9: docs: a11y doc typo
* commit '
4045e6b9ab296436cb5344f3af7184c2ce2a8ff0':
docs: a11y doc typo
Scott Main [Thu, 24 Mar 2011 20:25:48 +0000 (13:25 -0700)]
docs: a11y doc typo
Change-Id: Ib4c41c129c8ecbd738dfe6866bd429efdf17c23f
Gloria Wang [Thu, 24 Mar 2011 20:14:02 +0000 (13:14 -0700)]
Fix for bug
4126624.
Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
Change-Id: I7aacea1bc58ab6425ef6f6f09472c6f2970ebb4d
Scott Main [Thu, 24 Mar 2011 19:29:24 +0000 (12:29 -0700)]
am
119e79cf: am
e0b3f2a7: docs: fix a few things in a11y doc
* commit '
119e79cf2763592389b4543612400d746bb9aeb2':
docs: fix a few things in a11y doc
Scott Main [Thu, 24 Mar 2011 19:26:58 +0000 (12:26 -0700)]
am
e0b3f2a7: docs: fix a few things in a11y doc
* commit '
e0b3f2a788e63a10b0fa21bdd700fbcf7e1add34':
docs: fix a few things in a11y doc
Scott Main [Thu, 24 Mar 2011 19:15:35 +0000 (12:15 -0700)]
docs: fix a few things in a11y doc
Change-Id: I142b0b4498cf6d19655ad1ccc2066e59c39e75a6
Scott Main [Thu, 24 Mar 2011 17:54:08 +0000 (10:54 -0700)]
am
95cb883c: am
b7cfa729: Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb
* commit '
95cb883c066b754a96c899b48bd487e2ad0f213d':
docs: add document for accessibility, authored by Cheryl Simon (clsimon)
Scott Main [Thu, 24 Mar 2011 17:51:50 +0000 (10:51 -0700)]
am
b7cfa729: Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb
* commit '
b7cfa72932fbb3c794c6e5509b4a5b716236f558':
docs: add document for accessibility, authored by Cheryl Simon (clsimon)
Scott Main [Thu, 24 Mar 2011 17:49:59 +0000 (10:49 -0700)]
Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb
Gloria Wang [Thu, 24 Mar 2011 17:42:14 +0000 (10:42 -0700)]
am
e2cd3353: Merge "Fix for bug
4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from Do not merge." into honeycomb-mr1
* commit '
e2cd33531182b31e0ace2c3acb0e960fbf1ba273':
Fix for bug
4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge.
Gloria Wang [Thu, 24 Mar 2011 17:40:26 +0000 (10:40 -0700)]
Merge "Fix for bug
4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from Do not merge." into honeycomb-mr1
Bill Gruber [Thu, 24 Mar 2011 17:33:53 +0000 (10:33 -0700)]
am
6efa3599: am
e002734d: Merge "IAB doc updates for final launch plus bug fixes Bug:
3491550 Bug:
3491426 Bug:
3407948" into honeycomb
* commit '
6efa3599590d3c75a648c3d93353011eb8e30278':
IAB doc updates for final launch plus bug fixes Bug:
3491550 Bug:
3491426 Bug:
3407948
Gloria Wang [Thu, 24 Mar 2011 05:35:13 +0000 (22:35 -0700)]
Fix for bug
4165823.
Add death listener to clean-up drmserver appropriately when drmserver died.
Cherry-pick from master. Do not merge.
Change-Id: I7782cc96ce173a87ebfd315950f3880fa90294d6
Bill Gruber [Thu, 24 Mar 2011 17:30:30 +0000 (10:30 -0700)]
am
e002734d: Merge "IAB doc updates for final launch plus bug fixes Bug:
3491550 Bug:
3491426 Bug:
3407948" into honeycomb
* commit '
e002734dd2b330ff6f964eeccaf3c6c6207dd9bf':
IAB doc updates for final launch plus bug fixes Bug:
3491550 Bug:
3491426 Bug:
3407948
Bill Gruber [Thu, 24 Mar 2011 17:26:20 +0000 (10:26 -0700)]
Merge "IAB doc updates for final launch plus bug fixes Bug:
3491550 Bug:
3491426 Bug:
3407948" into honeycomb
Bill Gruber [Thu, 24 Mar 2011 16:59:06 +0000 (09:59 -0700)]
IAB doc updates for final launch plus bug fixes
Bug:
3491550
Bug:
3491426
Bug:
3407948
Change-Id: I6f02397a62a3f73599ac7ded28e47d9bb1a3d3e9
Scott Main [Wed, 23 Mar 2011 17:51:55 +0000 (10:51 -0700)]
docs: add document for accessibility, authored by Cheryl Simon (clsimon)
Change-Id: If4f6e4f12953ae5b608efebde1ac9d3f0720035a
Romain Guy [Thu, 24 Mar 2011 02:31:38 +0000 (19:31 -0700)]
am
b5fa4909: DO NOT MERGE Take fake bold font property into account. Bug #
4159731
* commit '
b5fa490995dff116b8a6fdc274bee6f6db4d0d0c':
DO NOT MERGE Take fake bold font property into account. Bug #
4159731
Romain Guy [Wed, 23 Mar 2011 21:59:20 +0000 (14:59 -0700)]
DO NOT MERGE Take fake bold font property into account.
Bug #
4159731
For real this time!
Change-Id: I042eca64bfb355f8d60cec430eb942c900062761
Teng-Hui Zhu [Thu, 24 Mar 2011 00:34:15 +0000 (17:34 -0700)]
am
2d09b855: Merge "When the video is not on the front, it should be paused" into honeycomb-mr1
* commit '
2d09b855d5c0749ab845d3f2775125fea294f07c':
When the video is not on the front, it should be paused
Teng-Hui Zhu [Thu, 24 Mar 2011 00:32:43 +0000 (17:32 -0700)]
Merge "When the video is not on the front, it should be paused" into honeycomb-mr1
Glenn Kasten [Thu, 24 Mar 2011 00:06:12 +0000 (17:06 -0700)]
am
0b1b2a32: Merge "Bug
4159373 Use HDCP debug settings" into honeycomb-mr1
* commit '
0b1b2a3212cc6c96959e009a9705f94f2ed8b4f4':
Bug
4159373 Use HDCP debug settings
Glenn Kasten [Thu, 24 Mar 2011 00:03:46 +0000 (17:03 -0700)]
Merge "Bug
4159373 Use HDCP debug settings" into honeycomb-mr1
Teng-Hui Zhu [Wed, 23 Mar 2011 23:54:20 +0000 (16:54 -0700)]
When the video is not on the front, it should be paused
bug:
4165855
Change-Id: Icbdab81fe5beb8642841b16773b0e5350b4221cf
Glenn Kasten [Wed, 23 Mar 2011 21:34:31 +0000 (14:34 -0700)]
Bug
4159373 Use HDCP debug settings
Change-Id: Iefc0a0d4b574ee94fbc83bf74b57c1d3465c821c
Teng-Hui Zhu [Wed, 23 Mar 2011 23:06:10 +0000 (16:06 -0700)]
am
efb8eda4: Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1
* commit '
efb8eda41a2dce03db0984c490c16f6a32867ded':
Make sure the full screen playing continue when timeout
Wink Saville [Wed, 23 Mar 2011 23:05:52 +0000 (16:05 -0700)]
Merge "Fix NPE in CatService.encodeOptionalTags." into honeycomb-LTE
Teng-Hui Zhu [Wed, 23 Mar 2011 23:03:04 +0000 (16:03 -0700)]
Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1
shailendra [Wed, 23 Mar 2011 22:47:47 +0000 (15:47 -0700)]
am
ac390b8c: Merge "Fix for Media Server memory leak" into honeycomb-mr1
* commit '
ac390b8cacc45c866ae2e60c0e492a914cf6ec78':
Fix for Media Server memory leak
Wink Saville [Wed, 23 Mar 2011 22:47:25 +0000 (15:47 -0700)]
Fix NPE in CatService.encodeOptionalTags.
If cmdDet.typeOfCommand is bad fromInt returns null we now log the
error instead of causing a Null Pointer Exception.
Change-Id: Id6a0d295d988c2bdbd46a0c0dd6b20f5baf02b27
Bill Gruber [Wed, 23 Mar 2011 22:43:09 +0000 (15:43 -0700)]
am
0357ec78: Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug:
4119363" into honeycomb-mr1
* commit '
0357ec78b82ae104e56c26941d42fa7ef875462b':
DRM API doc scrub This change contains information contributed by Sony Corporation. Bug:
4119363
shailendra [Wed, 23 Mar 2011 22:33:51 +0000 (15:33 -0700)]
Merge "Fix for Media Server memory leak" into honeycomb-mr1
Teng-Hui Zhu [Wed, 23 Mar 2011 22:29:22 +0000 (15:29 -0700)]
Make sure the full screen playing continue when timeout
bug:
4165804
Change-Id: I5e0f4bdaecce36d074941ae6631b211227c13fcb
Bill Gruber [Wed, 23 Mar 2011 21:58:31 +0000 (14:58 -0700)]
Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug:
4119363" into honeycomb-mr1
Scott Main [Wed, 23 Mar 2011 21:43:35 +0000 (14:43 -0700)]
am
18cd686f: am
ef6b305b: docs: fix markup error
* commit '
18cd686fc828c9c75596de1494ecaa5467fcc195':
docs: fix markup error
Scott Main [Wed, 23 Mar 2011 21:32:44 +0000 (14:32 -0700)]
am
ef6b305b: docs: fix markup error
* commit '
ef6b305b93009b60ad7c6ddbd200d1b5c554963f':
docs: fix markup error
Scott Main [Wed, 23 Mar 2011 21:23:02 +0000 (14:23 -0700)]
docs: fix markup error
Change-Id: I59e379a7a36c4184862095442c53a6b9496d856e
Bill Gruber [Thu, 17 Mar 2011 23:04:18 +0000 (16:04 -0700)]
DRM API doc scrub
This change contains information contributed by Sony Corporation.
Bug:
4119363
Change-Id: I6f565c15d512d675993dc65f7fee19bd3d0bc0fa
Scott Main [Wed, 23 Mar 2011 17:33:49 +0000 (10:33 -0700)]
am
7d02efa1: am
fb340563: docs: add Asus driver link to oem driver page
* commit '
7d02efa1029435dfa3a4a9f8449ee1cbda543730':
docs: add Asus driver link to oem driver page
Scott Main [Wed, 23 Mar 2011 17:25:00 +0000 (10:25 -0700)]
am
fb340563: docs: add Asus driver link to oem driver page
* commit '
fb340563e81f93bc179e51bffc846ac03ff02609':
docs: add Asus driver link to oem driver page
Scott Main [Wed, 23 Mar 2011 16:59:05 +0000 (09:59 -0700)]
docs: add Asus driver link to oem driver page
Change-Id: Ia93dd9a6c2c23f236b75a9c83acb8ce4c4b94ffa
Robert Greenwalt [Wed, 23 Mar 2011 04:37:48 +0000 (21:37 -0700)]
am
ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1
* commit '
ac70fb8be6ea3a6b49d0a8a26e99c25f92013516':
Fix adding of default route.
Robert Greenwalt [Wed, 23 Mar 2011 04:36:04 +0000 (21:36 -0700)]
Merge "Fix adding of default route." into honeycomb-mr1
shailendra [Thu, 17 Mar 2011 00:30:18 +0000 (17:30 -0700)]
Fix for Media Server memory leak
bug -
4081123
Change-Id: Ic88c13f8006227cff2c91a31f5d1828d007125af
Eric Rowe [Wed, 23 Mar 2011 01:59:00 +0000 (18:59 -0700)]
am
5e66ccf5: Merge "Clean up BT stress tests." into honeycomb-mr1
* commit '
5e66ccf5c41bd67e2b1b3f4cc4671af8e115fe7a':
Clean up BT stress tests.
Eric Rowe [Wed, 23 Mar 2011 01:57:27 +0000 (18:57 -0700)]
Merge "Clean up BT stress tests." into honeycomb-mr1
Robert Greenwalt [Wed, 23 Mar 2011 01:47:42 +0000 (18:47 -0700)]
Fix adding of default route.
If you deleted the host routes (started a secondary network like mms, supl
of hipri and then ended it) you would lose the host route to the default
gateway. Then if you needed to re-add the default gateway route (lost
the connection and removed the default route and then re-established)
you couldn't - can't add a gateway that isn't routable apparently.
This happens if you are in a video chat and lose your connection without
losing the interface (PPP keeps it up for a bit).
Fixed it by having addDefaultRoute first add a hsot route for the gateway
before adding the default route. This allows the default add to succeed.
bug:
3490353
Change-Id: I415e7319832e6456f8757b14c4f79f098a08839b
Wink Saville [Tue, 22 Mar 2011 23:05:22 +0000 (16:05 -0700)]
Merge "Tweak RIL.java debug." into honeycomb-LTE
Wink Saville [Tue, 22 Mar 2011 22:30:41 +0000 (15:30 -0700)]
Merge "Remove unused onResetDone." into honeycomb-LTE
Robert Greenwalt [Thu, 17 Mar 2011 00:10:24 +0000 (17:10 -0700)]
Remove unused onResetDone.
Refactor things a bit. Promoting GsmDataConnection's apn (ApnSetting) to DataConnection.
Use DataConnection's resetSynchronously rather than tampering with it from another thread.
bug:
3486066
Change-Id: I2a7f7368f73c7d5c81e821976efafd56aca7aa69
Eric Fischer [Tue, 22 Mar 2011 20:59:20 +0000 (13:59 -0700)]
am
3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
3a2575f7e6b1f6da97bd8233dfd3baa8883c5610':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 22 Mar 2011 20:56:47 +0000 (13:56 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Teng-Hui Zhu [Tue, 22 Mar 2011 20:56:35 +0000 (13:56 -0700)]
am
5039e6da: Merge "fix for pause when loading" into honeycomb-mr1
* commit '
5039e6da1e74c0a0c10772f585ea4e5e6bcf0a16':
fix for pause when loading
Teng-Hui Zhu [Tue, 22 Mar 2011 20:55:28 +0000 (13:55 -0700)]
Merge "fix for pause when loading" into honeycomb-mr1
Eric Fischer [Tue, 22 Mar 2011 20:38:10 +0000 (13:38 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I705ed1f382974b8b12dc024cdb9e2f026e6e86b8
Dianne Hackborn [Tue, 22 Mar 2011 20:01:19 +0000 (13:01 -0700)]
am
8dcd6647: Merge "Now have a final API 12." into honeycomb-mr1
* commit '
8dcd66476069c9241c2acbbafc1a85e42bd7a303':
Now have a final API 12.
Dianne Hackborn [Tue, 22 Mar 2011 19:58:00 +0000 (12:58 -0700)]
Merge "Now have a final API 12." into honeycomb-mr1
Teng-Hui Zhu [Tue, 22 Mar 2011 18:39:23 +0000 (11:39 -0700)]
fix for pause when loading
bug:
4148903
Change-Id: Ib0b59c8c36eb5df8c6755156a5d2753f84ad9677
shailendra [Tue, 22 Mar 2011 18:50:15 +0000 (11:50 -0700)]
am
8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(
4128259)" into honeycomb-mr1
* commit '
8483073ec21b5e2332deaad914eba1d087b1d1e3':
Fix for testPropertiesWMVFile case failed with build HMI75B(
4128259)
shailendra [Tue, 22 Mar 2011 18:48:12 +0000 (11:48 -0700)]
Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(
4128259)" into honeycomb-mr1
Gloria Wang [Tue, 22 Mar 2011 18:06:43 +0000 (11:06 -0700)]
am
3cc797b9: Merge "Add one more field in DecryptHandle to support bug
4126624" into honeycomb-mr1
* commit '
3cc797b9c416e01ad6bfab5f2bfb2c6cbf9e44ed':
Add one more field in DecryptHandle to support bug
4126624
Gloria Wang [Tue, 22 Mar 2011 18:04:32 +0000 (11:04 -0700)]
Merge "Add one more field in DecryptHandle to support bug
4126624" into honeycomb-mr1
Dianne Hackborn [Tue, 22 Mar 2011 17:44:59 +0000 (10:44 -0700)]
Now have a final API 12.
Change-Id: I7475ed7f82e4875c7e51671703821e5735dc1433
Wink Saville [Sun, 20 Mar 2011 00:21:36 +0000 (17:21 -0700)]
Tweak RIL.java debug.
Changed the one use of DBG to RILJ_LOGD and make
RILJ_LOGV a STOPSHIP if true. I then use that to
output IMSI, IMEI and IMEISV to assist in initial
bring up of RIL's.
Change-Id: Ieb9d1120f76c89c130cbecb2992603fc6af71b96
Andreas Huber [Tue, 22 Mar 2011 15:48:58 +0000 (08:48 -0700)]
am
453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
* commit '
453c0d5f16a09473b0653566973bf8b6a867cf79':
DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
Andreas Huber [Tue, 22 Mar 2011 15:37:58 +0000 (08:37 -0700)]
Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
Gloria Wang [Tue, 22 Mar 2011 00:22:13 +0000 (17:22 -0700)]
Add one more field in DecryptHandle to support bug
4126624
Change-Id: Ic7ea5fd211c4f8283de8fdf722f89b6a94e5750b
Teng-Hui Zhu [Tue, 22 Mar 2011 01:13:21 +0000 (18:13 -0700)]
am
039aa81a: Merge "Fix a crash" into honeycomb-mr1
* commit '
039aa81a67465f189c24f92567ccb08ed8a5dce2':
Fix a crash
Teng-Hui Zhu [Tue, 22 Mar 2011 01:09:57 +0000 (18:09 -0700)]
Merge "Fix a crash" into honeycomb-mr1
Yu Shan Emily Lau [Tue, 22 Mar 2011 01:00:32 +0000 (18:00 -0700)]
am
02109972: Merge "Add the mem logging into test utility. Bug#
4108259" into honeycomb-mr1
* commit '
0210997218fc22b77c71a43a2396419cd0a39166':
Add the mem logging into test utility. Bug#
4108259
Gloria Wang [Tue, 22 Mar 2011 01:00:30 +0000 (18:00 -0700)]
am
7abedd0c: Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug
4126624." into honeycomb-mr1
* commit '
7abedd0cdefdcd6d3b62808724e721bb1b92b185':
do not merge: Cherry pick change I6529695c from master to partially fix bug
4126624.
Justin Ho [Tue, 22 Mar 2011 00:59:59 +0000 (17:59 -0700)]
am
9db9a7d3: Merge "Fixing list selector theme Bug:
4147203" into honeycomb-mr1
* commit '
9db9a7d3f4428552b3ce553df5184bcbbe8db8dd':
Fixing list selector theme Bug:
4147203
Teng-Hui Zhu [Mon, 21 Mar 2011 21:26:14 +0000 (14:26 -0700)]
Fix a crash
bug:
4139931
Change-Id: Ifc18f964d5aedb268eb0d5fa08db3ffed1de4ff8
Yu Shan Emily Lau [Tue, 22 Mar 2011 00:32:17 +0000 (17:32 -0700)]
Merge "Add the mem logging into test utility. Bug#
4108259" into honeycomb-mr1
Gloria Wang [Tue, 22 Mar 2011 00:26:03 +0000 (17:26 -0700)]
Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug
4126624." into honeycomb-mr1
Gloria Wang [Mon, 21 Mar 2011 23:53:14 +0000 (16:53 -0700)]
do not merge: Cherry pick change I6529695c from master to partially fix bug
4126624.
Change-Id: If724de60bd6da1becdffc815d5358ffe78629469
Justin Ho [Mon, 21 Mar 2011 23:52:35 +0000 (16:52 -0700)]
Merge "Fixing list selector theme Bug:
4147203" into honeycomb-mr1
Andreas Huber [Mon, 21 Mar 2011 23:28:04 +0000 (16:28 -0700)]
DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
Change-Id: Ic683201dcfcd11fb4bccfeefc63427a4c9bfabb4
related-to-bug:
4148291
Andreas Huber [Mon, 21 Mar 2011 23:21:29 +0000 (16:21 -0700)]
am
e2c32e9f: If nothing is to be copied, return right away.
* commit '
e2c32e9f966cf9f2c9ed94bf0703344a2cca284b':
If nothing is to be copied, return right away.
Justin Ho [Mon, 21 Mar 2011 22:04:23 +0000 (15:04 -0700)]
Fixing list selector theme
Bug:
4147203
Change-Id: Ib9052ca399a135d42fd5c6ccf2bea8babfe8f0ac
Teng-Hui Zhu [Mon, 21 Mar 2011 21:19:29 +0000 (14:19 -0700)]
am
0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1
* commit '
0b933c02dddbc325498b3b73d8be9167b155801b':
Support loading image and paused image for inline video
Andreas Huber [Mon, 21 Mar 2011 21:16:03 +0000 (14:16 -0700)]
If nothing is to be copied, return right away.
This avoids a potential out-of-bounds problem in the code below.
Change-Id: I942d55da0a5288b37512cb74407f900a2d824c0c
related-to-bug:
4139974
Teng-Hui Zhu [Mon, 21 Mar 2011 21:01:10 +0000 (14:01 -0700)]
Merge "Support loading image and paused image for inline video" into honeycomb-mr1
Justin Ho [Mon, 21 Mar 2011 17:54:51 +0000 (10:54 -0700)]
am
5e35c485: Updated 3G and wifi traffic indicators
* commit '
5e35c4855a972960403a10811882ebded8945006':
Updated 3G and wifi traffic indicators
Teng-Hui Zhu [Fri, 18 Mar 2011 21:56:10 +0000 (14:56 -0700)]
Support loading image and paused image for inline video
bug:
4142131
Change-Id: I28d82a8e30a2146a3380c63dcdcbd51228f23f56
OSDN Git Service
