OSDN Git Service
Benoit Goby [Tue, 12 Apr 2011 01:41:23 +0000 (18:41 -0700)]
resolved conflicts for merge of
08c39c6a to honeycomb-LTE
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
Glenn Kasten [Mon, 11 Apr 2011 19:43:28 +0000 (12:43 -0700)]
am
c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)
* commit '
c6c2285b36e83b96056e2404371cdf6e6f7acaee':
Enable HDCP debugging in Stagefright (1 of 2)
Wink Saville [Mon, 11 Apr 2011 19:04:47 +0000 (12:04 -0700)]
Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE
Freeman Ng [Mon, 11 Apr 2011 18:10:18 +0000 (11:10 -0700)]
Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE
Wink Saville [Sat, 9 Apr 2011 14:50:37 +0000 (07:50 -0700)]
Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE
Jamie Gennis [Sat, 9 Apr 2011 00:40:00 +0000 (17:40 -0700)]
am
66380f76: Stagefright: authenticate ANativeWindow.
* commit '
66380f768c0de8bde1f54ac6ab3f126b66928dad':
Stagefright: authenticate ANativeWindow.
Robert Greenwalt [Sat, 9 Apr 2011 00:19:53 +0000 (17:19 -0700)]
Merge "Make ApnSettings threadsafe." into honeycomb-LTE
Robert Greenwalt [Fri, 8 Apr 2011 23:31:03 +0000 (16:31 -0700)]
Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE
Robert Greenwalt [Fri, 8 Apr 2011 23:22:06 +0000 (16:22 -0700)]
Merge "Fix notification of disconnected networks." into honeycomb-LTE
Wink Saville [Fri, 8 Apr 2011 20:20:20 +0000 (13:20 -0700)]
Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE
Wink Saville [Fri, 8 Apr 2011 17:38:25 +0000 (10:38 -0700)]
Merge "DataConnection: set CID to the correct value." into honeycomb-LTE
Robert Greenwalt [Fri, 8 Apr 2011 17:07:31 +0000 (10:07 -0700)]
Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE
Nicolas Roard [Fri, 8 Apr 2011 00:24:05 +0000 (17:24 -0700)]
am
fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:
4183801" into honeycomb-mr1
* commit '
fcba23536b1b432a5977e1ba4ea70ae0ff5aed4a':
Remove uncalled function -- java counterpart of the fix for bug:
4183801
Nicolas Roard [Fri, 8 Apr 2011 00:21:53 +0000 (17:21 -0700)]
Merge "Remove uncalled function -- java counterpart of the fix for bug:
4183801" into honeycomb-mr1
Wink Saville [Thu, 7 Apr 2011 23:49:02 +0000 (16:49 -0700)]
Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE
Bill Gruber [Thu, 7 Apr 2011 22:14:54 +0000 (15:14 -0700)]
am
6bb8b0ec: am
afecd1e9: IAB docs--status codes fix Bug:
4208641
* commit '
6bb8b0ecb558373ba99e44ad5c351e1d7bb410d6':
IAB docs--status codes fix Bug:
4208641
Bill Gruber [Thu, 7 Apr 2011 22:09:33 +0000 (15:09 -0700)]
am
afecd1e9: IAB docs--status codes fix Bug:
4208641
* commit '
afecd1e99284dc386f07571c69edfed8c12f1cef':
IAB docs--status codes fix Bug:
4208641
Wink Saville [Thu, 7 Apr 2011 21:28:06 +0000 (14:28 -0700)]
Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE
Teng-Hui Zhu [Thu, 7 Apr 2011 21:22:33 +0000 (14:22 -0700)]
am
bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
* commit '
bb55777be1a3231d187205dc378ca35b01e8bc65':
DO NOT MERGE : cherry pick of change Ieb7ae26b from master
DO NOT MERGE : cherry pick of change I0f9f2c65 from master
Teng-Hui Zhu [Thu, 7 Apr 2011 21:17:52 +0000 (14:17 -0700)]
Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
* changes:
DO NOT MERGE : cherry pick of change Ieb7ae26b from master
DO NOT MERGE : cherry pick of change I0f9f2c65 from master
Xavier Ducrohet [Thu, 7 Apr 2011 20:38:13 +0000 (13:38 -0700)]
am
515a08b0: Merge
59aad78e from do not merge.
* commit '
515a08b01851a1ab9386f85dee6d9fd7b65ee7ad':
Merge
59aad78e from master. do not merge.
Robert Greenwalt [Thu, 7 Apr 2011 20:02:28 +0000 (13:02 -0700)]
Merge "Add external dependency API." into honeycomb-LTE
John Wang [Thu, 7 Apr 2011 19:44:14 +0000 (12:44 -0700)]
Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE
John Wang [Thu, 7 Apr 2011 19:44:04 +0000 (12:44 -0700)]
Merge "Make LinkProperties comparable." into honeycomb-LTE
Wink Saville [Thu, 7 Apr 2011 16:35:18 +0000 (09:35 -0700)]
Merge "Add a 4G icon for LTE." into honeycomb-LTE
Teng-Hui Zhu [Thu, 7 Apr 2011 16:07:52 +0000 (09:07 -0700)]
am
b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1
* commit '
b25181aaccb00fee405251bf3575ce1d40badf46':
Fix the issue the video can't start to play
Teng-Hui Zhu [Thu, 7 Apr 2011 15:52:45 +0000 (08:52 -0700)]
Merge "Fix the issue the video can't start to play" into honeycomb-mr1
Wink Saville [Thu, 7 Apr 2011 00:52:22 +0000 (17:52 -0700)]
Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE
Roman Nurik [Thu, 7 Apr 2011 00:21:21 +0000 (17:21 -0700)]
am
b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1
* commit '
b17cc8a83fd819efcb79d78d005e16b3f04d08df':
Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table.
Roman Nurik [Thu, 7 Apr 2011 00:18:47 +0000 (17:18 -0700)]
Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1
Eric Fischer [Wed, 6 Apr 2011 21:12:31 +0000 (14:12 -0700)]
am
9f2f650f: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
9f2f650f26941a7cd4931afc66f39918e7c2817c':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 6 Apr 2011 21:09:32 +0000 (14:09 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Bill Gruber [Wed, 6 Apr 2011 20:58:34 +0000 (13:58 -0700)]
am
3bd37307: am
48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb
* commit '
3bd373079ed2599e5e07aa1cf702c7f8386765c3':
IAB docs: fixes line break issues
Bill Gruber [Wed, 6 Apr 2011 20:20:27 +0000 (13:20 -0700)]
am
48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb
* commit '
48a1b52bc736acfe9c4723abf6db7c8befc5e43b':
IAB docs: fixes line break issues
Bill Gruber [Wed, 6 Apr 2011 19:52:41 +0000 (12:52 -0700)]
Merge "IAB docs: fixes line break issues" into honeycomb
Xavier Ducrohet [Wed, 6 Apr 2011 19:41:17 +0000 (12:41 -0700)]
am
c5aeac7f: LayoutLib: Fix issue with rendering mode.
* commit '
c5aeac7f157e3cb9e29ab8c126f74e26493501f5':
LayoutLib: Fix issue with rendering mode.
Scott Main [Tue, 5 Apr 2011 21:28:23 +0000 (14:28 -0700)]
am
e4cafabb: am
a90eb8fe: docs: fix the TOC in a few docs
* commit '
e4cafabbcc4b69479217d1a167926b79c37e5ded':
docs: fix the TOC in a few docs
Scott Main [Tue, 5 Apr 2011 21:21:36 +0000 (14:21 -0700)]
am
a90eb8fe: docs: fix the TOC in a few docs
* commit '
a90eb8fec1c67177b614b945bcc4a4b14aaabaff':
docs: fix the TOC in a few docs
Adam Powell [Tue, 5 Apr 2011 18:14:27 +0000 (11:14 -0700)]
am
030b38ff: Merge "Fix bug
4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1
* commit '
030b38ffc21ef3962b31d5bac5170531293b6046':
Fix bug
4207704 - Gestures can be lost when Flash is enabled
Adam Powell [Tue, 5 Apr 2011 17:45:25 +0000 (10:45 -0700)]
Merge "Fix bug
4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1
Bill Gruber [Tue, 5 Apr 2011 00:31:23 +0000 (17:31 -0700)]
am
63ac0379: am
d36bc32e: Merge "SDK doc updates" into honeycomb
* commit '
63ac03794df9ca383416c3a782812b9a9c03456d':
SDK doc updates
Bill Gruber [Tue, 5 Apr 2011 00:21:25 +0000 (17:21 -0700)]
am
d36bc32e: Merge "SDK doc updates" into honeycomb
* commit '
d36bc32ea9a109596308a0516b3e0898c82cebc5':
SDK doc updates
Bill Gruber [Tue, 5 Apr 2011 00:15:08 +0000 (17:15 -0700)]
Merge "SDK doc updates" into honeycomb
Roman Nurik [Mon, 4 Apr 2011 20:44:23 +0000 (13:44 -0700)]
am
5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1
* commit '
5a41a8a0fda21d5332f1355832550fcfffbb9975':
Document support for .TS video containers.
Roman Nurik [Mon, 4 Apr 2011 20:41:11 +0000 (13:41 -0700)]
Merge "Document support for .TS video containers." into honeycomb-mr1
Robert Ly [Mon, 4 Apr 2011 18:41:02 +0000 (11:41 -0700)]
am
3f39f653: Adding package description for android.hardware.usb
* commit '
3f39f653a90f9727d13be1e9908f0afb8fe66d6e':
Adding package description for android.hardware.usb
Dirk Dougherty [Sun, 3 Apr 2011 21:04:20 +0000 (14:04 -0700)]
am
f9cdf7fe: Doc change: add diff report for API 12.
* commit '
f9cdf7feb47aa142e11862f5694c0a29ac013a51':
Doc change: add diff report for API 12.
Dirk Dougherty [Sun, 3 Apr 2011 20:50:48 +0000 (13:50 -0700)]
am
16769201: Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1
* commit '
1676920113d35b66e6e8846ffb7dded7e011c2fa':
Doc change: update media formats tables with adts/aac and flac
Dirk Dougherty [Sun, 3 Apr 2011 20:40:48 +0000 (13:40 -0700)]
Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1
Scott Main [Sat, 2 Apr 2011 00:41:40 +0000 (17:41 -0700)]
am
90a1befa: am
27690eba: Merge "docs: update device dashboard" into honeycomb
* commit '
90a1befa551a9e6dc8f06b7331e26e6470ab824f':
docs: update device dashboard
Scott Main [Sat, 2 Apr 2011 00:39:05 +0000 (17:39 -0700)]
am
27690eba: Merge "docs: update device dashboard" into honeycomb
* commit '
27690ebabc915091956f0331023c9d074177271d':
docs: update device dashboard
Scott Main [Sat, 2 Apr 2011 00:36:42 +0000 (17:36 -0700)]
Merge "docs: update device dashboard" into honeycomb
Wink Saville [Fri, 1 Apr 2011 23:34:51 +0000 (16:34 -0700)]
Merge "Data Retry fix after failure due to permanent causes." into honeycomb-LTE
Scott Main [Fri, 1 Apr 2011 23:22:35 +0000 (16:22 -0700)]
am
6261861a: am
cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
* commit '
6261861a94448e4fbc26e313ce1410a184a10914':
docs: update homepage announcement for Google IO
Scott Main [Fri, 1 Apr 2011 23:19:30 +0000 (16:19 -0700)]
am
cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
* commit '
cb719a48a2f2e9bc47b317f75ebb8320f6ce877c':
docs: update homepage announcement for Google IO
Scott Main [Fri, 1 Apr 2011 23:17:40 +0000 (16:17 -0700)]
Merge "docs: update homepage announcement for Google IO" into honeycomb
Mike Lockwood [Fri, 1 Apr 2011 18:34:39 +0000 (11:34 -0700)]
am
11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.
* commit '
11dd5ae97b1cd5889bb66862fd12718da62a9c75':
Improve Javadoc for USB Manager and MTP/PTP support.
Wink Saville [Fri, 1 Apr 2011 17:28:22 +0000 (10:28 -0700)]
Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE
Scott Main [Fri, 1 Apr 2011 02:10:56 +0000 (19:10 -0700)]
am
1ccdc235: am
e979332f: docs: fix markup bugs
* commit '
1ccdc235716715e7c6f13cab42e4195454e04615':
docs: fix markup bugs
Scott Main [Fri, 1 Apr 2011 02:06:33 +0000 (19:06 -0700)]
am
e979332f: docs: fix markup bugs
* commit '
e979332f38e677db4c9d89f695352ed41052553d':
docs: fix markup bugs
Wink Saville [Thu, 31 Mar 2011 22:51:07 +0000 (15:51 -0700)]
Merge "Telephony: Add Powerdown Cause to PDP Deactivate Message." into honeycomb-LTE
Wink Saville [Thu, 31 Mar 2011 20:16:41 +0000 (13:16 -0700)]
Merge "Telephony: Cleanup of SIM handling in CdmaLteSST." into honeycomb-LTE
Glenn Kasten [Thu, 31 Mar 2011 18:06:41 +0000 (11:06 -0700)]
Wink Saville [Thu, 31 Mar 2011 17:23:11 +0000 (10:23 -0700)]
Merge "Telephony: Update LTE RILConstants to match ril.h" into honeycomb-LTE
Dianne Hackborn [Thu, 31 Mar 2011 00:50:29 +0000 (17:50 -0700)]
am
53df89c7: Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1
* commit '
53df89c74fb3a31a874ad575467c5d498a53646e':
Expand screen documentation with explicit screen size dimensions.
Dianne Hackborn [Thu, 31 Mar 2011 00:43:17 +0000 (17:43 -0700)]
Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1
Justin Ho [Wed, 30 Mar 2011 22:59:19 +0000 (15:59 -0700)]
am
01b13a11: Merge "Replacing browser playback controls for inactive videos Bug:
4136024" into honeycomb-mr1
* commit '
01b13a11e6492ebba66c496eaefdb008f2638870':
Replacing browser playback controls for inactive videos Bug:
4136024
Justin Ho [Wed, 30 Mar 2011 22:57:42 +0000 (15:57 -0700)]
Merge "Replacing browser playback controls for inactive videos Bug:
4136024" into honeycomb-mr1
Trevor Johns [Wed, 30 Mar 2011 22:29:10 +0000 (15:29 -0700)]
am
e1cc88cc: am
eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketService.
* commit '
e1cc88ccaf5fec2671c2f50bd850e7c56b03f286':
Fixing line in Market IAB docs that explains how to bind to the MarketService.
Trevor Johns [Wed, 30 Mar 2011 22:26:38 +0000 (15:26 -0700)]
am
eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketService.
* commit '
eb344a69fa728c010425fb1e18fc8f5774693986':
Fixing line in Market IAB docs that explains how to bind to the MarketService.
Andreas Huber [Wed, 30 Mar 2011 22:19:46 +0000 (15:19 -0700)]
am
b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1
* commit '
b676b73e391b10a4ec5fbd6a1a02054fb3d8aa4b':
When http streaming and Content-Length is unknown, make sure to return all
Andreas Huber [Wed, 30 Mar 2011 22:16:36 +0000 (15:16 -0700)]
Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1
Eric Fischer [Wed, 30 Mar 2011 21:42:30 +0000 (14:42 -0700)]
am
91c482b2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
91c482b2351db1221308fe90800b8ef8bddbed90':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 30 Mar 2011 21:39:25 +0000 (14:39 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Scott Main [Wed, 30 Mar 2011 19:12:15 +0000 (12:12 -0700)]
am
5b68c655: Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1
* commit '
5b68c655a1f56dce1ffd6f175e991dd542d415cf':
docs: update makefile to show javadocs diffs for api level 12
Scott Main [Wed, 30 Mar 2011 19:10:13 +0000 (12:10 -0700)]
Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1
Andreas Huber [Wed, 30 Mar 2011 16:27:14 +0000 (09:27 -0700)]
am
ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1
* commit '
ebf6a72b3536646ade389c7afa828e316eb93c21':
Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
Andreas Huber [Wed, 30 Mar 2011 16:12:04 +0000 (09:12 -0700)]
Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1
Mike Lockwood [Wed, 30 Mar 2011 05:16:17 +0000 (22:16 -0700)]
am
44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
* commit '
44e4b99f823a6d6131f94e67389b705d3b124c0a':
UsbService: Make USB disconnect handling for accessory mode more robust
Mike Lockwood [Wed, 30 Mar 2011 05:14:27 +0000 (22:14 -0700)]
Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
Wink Saville [Tue, 29 Mar 2011 21:44:56 +0000 (14:44 -0700)]
Merge "Cleanup DataConnectionTracker" into honeycomb-LTE
Eric Fischer [Tue, 29 Mar 2011 21:15:22 +0000 (14:15 -0700)]
am
0664a4b1: am
b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
0664a4b18c3dcea82891a7389976a9d62ac7bc61':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 21:07:14 +0000 (14:07 -0700)]
am
b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
b42e83b1eccfd1fa1e02cd0c30edfc06e05de995':
Import revised translations. DO NOT MERGE
Amith Yamasani [Tue, 29 Mar 2011 21:06:29 +0000 (14:06 -0700)]
am
7171f5b7: Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1
* commit '
7171f5b7d16e9a0c861cc249188864385877077f':
Fix the javadoc for LocationManager.requestSingleUpdate()
Amith Yamasani [Tue, 29 Mar 2011 20:55:19 +0000 (13:55 -0700)]
Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1
Eric Fischer [Tue, 29 Mar 2011 20:45:03 +0000 (13:45 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Eric Fischer [Tue, 29 Mar 2011 19:20:42 +0000 (12:20 -0700)]
am
f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
f5cedbe508c46c27a6ce1554aed919bfbfc6fc4e':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 19:16:53 +0000 (12:16 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Bill Gruber [Tue, 29 Mar 2011 07:00:37 +0000 (00:00 -0700)]
am
e4f33617: am
faede250: IAB doc update for final launch
* commit '
e4f33617c3654bdcb246ee8f74e67d1828cd42c9':
IAB doc update for final launch
Bill Gruber [Tue, 29 Mar 2011 06:48:34 +0000 (23:48 -0700)]
am
faede250: IAB doc update for final launch
* commit '
faede250301e291a060d094c73a25a351f96cbb5':
IAB doc update for final launch
Wink Saville [Mon, 28 Mar 2011 19:11:42 +0000 (12:11 -0700)]
Merge "DataConnectionTracker cleanup when disposed." into honeycomb-LTE
Mike Lockwood [Mon, 28 Mar 2011 18:00:33 +0000 (11:00 -0700)]
am
7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1
* commit '
7661dd8de10d2400cedc421358c4261556b2b5c8':
UsbService: Fix JNI local reference leaks in the USB host support code
Mike Lockwood [Mon, 28 Mar 2011 17:58:03 +0000 (10:58 -0700)]
Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1
Andreas Huber [Mon, 28 Mar 2011 15:16:52 +0000 (08:16 -0700)]
am
2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1
* commit '
2edbdcc6f2572e5f84253617b1850908344b3f8c':
After a seek there's a brief period where audio time isn't reestablished.
Andreas Huber [Mon, 28 Mar 2011 15:11:26 +0000 (08:11 -0700)]
Merge "After a seek there's a brief period where audio time isn't reestablished." into honeycomb-mr1
Wink Saville [Sat, 26 Mar 2011 23:50:17 +0000 (16:50 -0700)]
Merge "Work around for operator not being correct." into honeycomb-LTE
Wink Saville [Sat, 26 Mar 2011 23:48:35 +0000 (16:48 -0700)]
Merge "Add some debug to apn list creation routines." into honeycomb-LTE
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.
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.
OSDN Git Service
