OSDN Git Service
Peter Ng [Fri, 28 Oct 2011 22:44:18 +0000 (22:44 +0000)]
am
146d018f: Merge "Checkbox and radio button assets are sharper and blue" into ics-mr1
* commit '
146d018f2083ec435ad76c18302cd9e2496ef4d8':
Checkbox and radio button assets are sharper and blue
Chet Haase [Fri, 28 Oct 2011 22:44:16 +0000 (22:44 +0000)]
am
d568bba5: Merge "Optimize handling of scrolled wallpapers" into ics-mr1
* commit '
d568bba507b0f66d4d57c67b08ade894d2c75e53':
Optimize handling of scrolled wallpapers
Svetoslav Ganov [Fri, 28 Oct 2011 22:40:32 +0000 (15:40 -0700)]
resolved conflicts for merge of
c00d2ddc to master
Change-Id: I075cc5b5df2909152ee463f8a0c7534344b47c62
Eric Fischer [Fri, 28 Oct 2011 22:27:54 +0000 (22:27 +0000)]
am
220d2b0a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
220d2b0aa126fbe09dee9e7e9afa1999521cf5d2':
Import revised translations. DO NOT MERGE
Gilles Debunne [Fri, 28 Oct 2011 22:27:50 +0000 (22:27 +0000)]
am
a068e2f1: am
4eec98ed: Merge "Text handles do not handle scroll correctly" into ics-mr0
* commit '
a068e2f1d9532e6f005a162adfa295c553873ca5':
Text handles do not handle scroll correctly
The Android Open Source Project [Fri, 28 Oct 2011 22:27:47 +0000 (22:27 +0000)]
am
58ba1b61: Reconcile with ics-mr0-release
* commit '
58ba1b6121a9f11bc1ba40eb5b267033bbf2fafb':
Revert "Clean up CursorWindow code."
Revert "Restore broken CursorWindow.getType behavior."
Revert "Clean up CursorWindow lifetime."
Revert "Fix regression in CursorWindow.copyStingToBuffer."
Revert "Fix regression in CursorWindow.getString()"
Revert "Clean up handrolled Binder proxies."
Revert "Fix ownership of CursorWindows across processes."
Revert "Use ashmem for CursorWindows."
Jeff Sharkey [Fri, 28 Oct 2011 22:27:38 +0000 (22:27 +0000)]
am
cc16024f: Merge "Differentiate between system_server and unknown." into ics-mr1
* commit '
cc16024f101c0fca211fcd069b3917becf7a3c00':
Differentiate between system_server and unknown.
Daniel Sandler [Fri, 28 Oct 2011 22:27:37 +0000 (22:27 +0000)]
am
4c7926fa: Merge "Tuning parameters for mobile RSSI." into ics-mr1
* commit '
4c7926fa27dacb92c8c7f3d57c4a3713dc0e3867':
Tuning parameters for mobile RSSI.
Raphael [Fri, 28 Oct 2011 22:27:22 +0000 (22:27 +0000)]
am
48ba4139: (-s ours) am
fe9a2a54: (-s ours) Cherry-pick
f51125d from master to ics-mr0. do not merge.
* commit '
48ba4139b9dc1f53f996b71f509a9d0c6fd2d72b':
Cherry-pick
f51125d from master to ics-mr0. do not merge.
Peter Ng [Fri, 28 Oct 2011 22:27:13 +0000 (22:27 +0000)]
am
63dd319e: Merge "Lockscreen on tablet is now using the same waveview widget as phone" into ics-mr1
* commit '
63dd319ebeea0421f8bf901b85b753dde1de74d7':
Lockscreen on tablet is now using the same waveview widget as phone
Adam Powell [Fri, 28 Oct 2011 22:27:12 +0000 (22:27 +0000)]
am
65793dc0: Merge "Add API for deferring fragment start." into ics-mr1
* commit '
65793dc043eee43790137f79beeba7ed8b123902':
Add API for deferring fragment start.
Gilles Debunne [Fri, 28 Oct 2011 22:26:22 +0000 (15:26 -0700)]
Merge "Performance improvement in TextView"
Gilles Debunne [Fri, 28 Oct 2011 22:26:07 +0000 (15:26 -0700)]
Merge changes I2082e3d0,Ibf8e9827
* changes:
Scroll performance improved in multiline TextEdit
Performance improvements for long text edition.
Peter Ng [Fri, 28 Oct 2011 22:20:27 +0000 (15:20 -0700)]
Merge "Checkbox and radio button assets are sharper and blue" into ics-mr1
Mark Wagner [Fri, 28 Oct 2011 22:16:37 +0000 (15:16 -0700)]
Merge "bugfix
5513340 Insertion pointer (vertical beam) behaves oddly in Talk's message composition field"
Chet Haase [Fri, 28 Oct 2011 22:13:27 +0000 (15:13 -0700)]
Merge "Optimize handling of scrolled wallpapers" into ics-mr1
Svetoslav Ganov [Fri, 28 Oct 2011 21:20:52 +0000 (14:20 -0700)]
Merge "Fixing a memory leak in accessibility enteraction APIs." into ics-mr1
Eric Fischer [Fri, 28 Oct 2011 20:59:31 +0000 (13:59 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Gilles Debunne [Fri, 28 Oct 2011 20:44:17 +0000 (20:44 +0000)]
am
4eec98ed: Merge "Text handles do not handle scroll correctly" into ics-mr0
* commit '
4eec98edee3d6eb516e30a7151da13fd726f93a9':
Text handles do not handle scroll correctly
Gilles Debunne [Fri, 28 Oct 2011 20:41:01 +0000 (13:41 -0700)]
Merge "Text handles do not handle scroll correctly" into ics-mr0
The Android Open Source Project [Fri, 28 Oct 2011 20:05:26 +0000 (13:05 -0700)]
Reconcile with ics-mr0-release
Change-Id: I6997b52967863156cd151e368e891b63024ebbb1
Jeff Sharkey [Fri, 28 Oct 2011 19:24:44 +0000 (12:24 -0700)]
Merge "Differentiate between system_server and unknown." into ics-mr1
Daniel Sandler [Fri, 28 Oct 2011 19:21:22 +0000 (12:21 -0700)]
Merge "Tuning parameters for mobile RSSI." into ics-mr1
Eric Fischer [Fri, 28 Oct 2011 19:10:44 +0000 (12:10 -0700)]
Merge "Import revised translations."
Glenn Kasten [Fri, 28 Oct 2011 18:57:56 +0000 (11:57 -0700)]
Merge "Bug
5522189 temporary workaround"
Raphael [Fri, 28 Oct 2011 18:54:36 +0000 (18:54 +0000)]
am
fe9a2a54: (-s ours) Cherry-pick
f51125d from master to ics-mr0. do not merge.
* commit '
fe9a2a5471616a3267b30013bce36b13a455c0cd':
Cherry-pick
f51125d from master to ics-mr0. do not merge.
Jeff Brown [Fri, 28 Oct 2011 18:52:01 +0000 (11:52 -0700)]
Merge "Optimize fillWindow to improve reverse-seek performance. Bug:
5520301"
Xavier Ducrohet [Fri, 28 Oct 2011 18:28:20 +0000 (11:28 -0700)]
Merge "AAPT fix printf %zd crash on Windows."
Peter Ng [Fri, 28 Oct 2011 17:53:54 +0000 (10:53 -0700)]
Merge "Lockscreen on tablet is now using the same waveview widget as phone" into ics-mr1
Adam Powell [Fri, 28 Oct 2011 17:43:33 +0000 (10:43 -0700)]
Merge "Add API for deferring fragment start." into ics-mr1
Gilles Debunne [Fri, 28 Oct 2011 17:08:32 +0000 (10:08 -0700)]
Merge "Cleaning and new constant in ViewConfiguration"
Gilles Debunne [Fri, 28 Oct 2011 17:08:22 +0000 (10:08 -0700)]
Merge "Revert "Potential thread concurrency issue with WordIterators.""
The Android Automerger [Fri, 28 Oct 2011 16:53:33 +0000 (09:53 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Scott Main [Fri, 28 Oct 2011 16:44:31 +0000 (16:44 +0000)]
am
43eed003: am
b44038fd: docs: platform note typo
* commit '
43eed0039c5534e68c82f13bab448fd7dc6845f7':
docs: platform note typo
Scott Main [Fri, 28 Oct 2011 16:39:46 +0000 (16:39 +0000)]
am
b44038fd: docs: platform note typo
* commit '
b44038fd294382d42070eb60df3bf5132eb4cb29':
docs: platform note typo
Andreas Huber [Fri, 28 Oct 2011 16:17:54 +0000 (16:17 +0000)]
am
27ed1249: Merge "Properly report that we\'re no longer playing after receiving event" into ics-mr1
* commit '
27ed12492dfbec6ec67b66ff3cf60febce370b01':
Properly report that we're no longer playing after receiving event
Andreas Huber [Fri, 28 Oct 2011 16:13:54 +0000 (09:13 -0700)]
Merge "Properly report that we're no longer playing after receiving event" into ics-mr1
Daniel Sandler [Fri, 28 Oct 2011 13:34:22 +0000 (13:34 +0000)]
am
ae561ae6: Merge "Fix initial Bluetooth icon state." into ics-mr1
* commit '
ae561ae62faf16ecd44b058ef966afd9b84feefe':
Fix initial Bluetooth icon state.
Daniel Sandler [Fri, 28 Oct 2011 13:29:51 +0000 (06:29 -0700)]
Merge "Fix initial Bluetooth icon state." into ics-mr1
Narayan Kamath [Fri, 28 Oct 2011 09:19:14 +0000 (09:19 +0000)]
am
7a2f6f38: Merge "Widen permissions on synthesized files." into ics-mr1
* commit '
7a2f6f38fe025654614d4c279fcfabf5819638b8':
Widen permissions on synthesized files.
Narayan Kamath [Fri, 28 Oct 2011 09:15:04 +0000 (02:15 -0700)]
Merge "Widen permissions on synthesized files." into ics-mr1
Jeff Brown [Thu, 27 Oct 2011 21:52:28 +0000 (14:52 -0700)]
Optimize fillWindow to improve reverse-seek performance.
Bug:
5520301
When an application requests a row from a SQLiteCursor that
is not in the window, instead of filling from the requested
row position onwards, fill from a little bit ahead of the
requested row position.
This fixes a problem with applications that seek backwards
in large cursor windows. Previously the application could
end up refilling the window every time it moved back
one position.
We try to fill about 1/3 before the requested position and
2/3 after which substantially improves scrolling responsiveness
when the list is bound to a data set that does not fit
entirely within one cursor window.
Change-Id: I168ff1d3aed1a41ac96267be34a026c108590e52
Jeff Brown [Fri, 28 Oct 2011 08:24:11 +0000 (08:24 +0000)]
am
ce6578ac: am
84bee4f8: Merge "Fix copyStringToBuffer row index calculation. Bug:
5515552" into ics-mr0
* commit '
ce6578acc5729f76fc93b6daafede413703a8d19':
Fix copyStringToBuffer row index calculation. Bug:
5515552
Jeff Brown [Fri, 28 Oct 2011 08:20:20 +0000 (08:20 +0000)]
am
84bee4f8: Merge "Fix copyStringToBuffer row index calculation. Bug:
5515552" into ics-mr0
* commit '
84bee4f8746a19428e0ddfd10df1130324dc39fa':
Fix copyStringToBuffer row index calculation. Bug:
5515552
Jeff Brown [Fri, 28 Oct 2011 08:18:07 +0000 (01:18 -0700)]
Merge "Fix copyStringToBuffer row index calculation. Bug:
5515552" into ics-mr0
Jim Miller [Fri, 28 Oct 2011 07:26:05 +0000 (07:26 +0000)]
am
c1a1cca8: Merge "Fix
5487180: Check for empty plmn/spn strings instead of just null" into ics-mr1
* commit '
c1a1cca866ff76a6dbfa500292593d8031908a9b':
Fix
5487180: Check for empty plmn/spn strings instead of just null
Jim Miller [Fri, 28 Oct 2011 07:22:53 +0000 (00:22 -0700)]
Merge "Fix
5487180: Check for empty plmn/spn strings instead of just null" into ics-mr1
Robert Greenwalt [Fri, 28 Oct 2011 04:10:54 +0000 (04:10 +0000)]
am
ca50b44e: am
c43b9b6d: Merge "Add SFR DUN configuration." into ics-mr0
* commit '
ca50b44e2f8a279a37c31dbf9571e12a1e429493':
Add SFR DUN configuration.
Robert Greenwalt [Fri, 28 Oct 2011 04:06:09 +0000 (04:06 +0000)]
am
c43b9b6d: Merge "Add SFR DUN configuration." into ics-mr0
* commit '
c43b9b6d97ed6dc40e181843aa79159c504e7004':
Add SFR DUN configuration.
Robert Greenwalt [Fri, 28 Oct 2011 04:04:17 +0000 (21:04 -0700)]
Merge "Add SFR DUN configuration." into ics-mr0
Peter Ng [Fri, 28 Oct 2011 02:53:26 +0000 (02:53 +0000)]
am
81bd76e4: Merge "Removing 2nd background clock font display from statusbar and lock screen" into ics-mr1
* commit '
81bd76e4b33ea00d30bb2b2193ca5bd0cf445546':
Removing 2nd background clock font display from statusbar and lock screen
Jake Hamby [Fri, 28 Oct 2011 02:53:24 +0000 (02:53 +0000)]
am
e3a31d03: am
31d157ba: Merge "Fix bug in enabling/disabling SMS cell broadcast activation." into ics-mr0
* commit '
e3a31d0340802352d568c8c35ff1fa1047018a42':
Fix bug in enabling/disabling SMS cell broadcast activation.
Justin Ho [Fri, 28 Oct 2011 02:53:23 +0000 (02:53 +0000)]
am
a196c688: am
9e7407ed: Merge "Increase navigation icon brightness by 10%" into ics-mr0
* commit '
a196c688ed1c8aa92d711b53c4dabd7d1399e740':
Increase navigation icon brightness by 10%
Justin Ho [Fri, 28 Oct 2011 02:53:21 +0000 (02:53 +0000)]
am
64653ac2: am
e7ff3906: Merge "Increase notification icon brightness" into ics-mr0
* commit '
64653ac2fa32a679f0695495764146a4be47897e':
Increase notification icon brightness
Jamie Gennis [Fri, 28 Oct 2011 02:53:20 +0000 (02:53 +0000)]
am
fc9592f8: am
08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0
* commit '
fc9592f8a5f2f75207e5e532655ac294eb2b334b':
Stagefright: ANW::connect in MediaPlayerService
Robert Greenwalt [Fri, 28 Oct 2011 02:53:18 +0000 (02:53 +0000)]
am
859bf0f2: am
81433a38: Merge "Temp disable Tethering if DUN is required" into ics-mr0
* commit '
859bf0f2efb7b5518055893c17aa3a6437023633':
Temp disable Tethering if DUN is required
Justin Ho [Fri, 28 Oct 2011 02:53:17 +0000 (02:53 +0000)]
am
1b15f7f1: (-s ours) am
28b3fd13: Merge "Correctly updating Roboto HHEA table" into ics-mr0
* commit '
1b15f7f1abc73683fe067e4b0b00e2e5c70a6282':
Correctly updating Roboto HHEA table
Peter Ng [Fri, 28 Oct 2011 02:17:19 +0000 (19:17 -0700)]
Merge "Removing 2nd background clock font display from statusbar and lock screen" into ics-mr1
Jake Hamby [Fri, 28 Oct 2011 02:14:08 +0000 (02:14 +0000)]
am
31d157ba: Merge "Fix bug in enabling/disabling SMS cell broadcast activation." into ics-mr0
* commit '
31d157bad27e4ecbe415f6f581946b6da7cc2ba3':
Fix bug in enabling/disabling SMS cell broadcast activation.
Justin Ho [Fri, 28 Oct 2011 02:14:05 +0000 (02:14 +0000)]
am
9e7407ed: Merge "Increase navigation icon brightness by 10%" into ics-mr0
* commit '
9e7407ed2b18800291612fb9fb355ef062801f07':
Increase navigation icon brightness by 10%
Justin Ho [Fri, 28 Oct 2011 02:14:04 +0000 (02:14 +0000)]
am
e7ff3906: Merge "Increase notification icon brightness" into ics-mr0
* commit '
e7ff39066c42f66913dbe23f61478273daa30f4d':
Increase notification icon brightness
Jamie Gennis [Fri, 28 Oct 2011 02:14:01 +0000 (02:14 +0000)]
am
08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0
* commit '
08479ceeba56c460fb52f60a24df27776f1936c3':
Stagefright: ANW::connect in MediaPlayerService
Robert Greenwalt [Fri, 28 Oct 2011 02:13:59 +0000 (02:13 +0000)]
am
81433a38: Merge "Temp disable Tethering if DUN is required" into ics-mr0
* commit '
81433a38784e64dbc155047a3915cf5eff32840b':
Temp disable Tethering if DUN is required
Justin Ho [Fri, 28 Oct 2011 02:13:56 +0000 (02:13 +0000)]
am
28b3fd13: Merge "Correctly updating Roboto HHEA table" into ics-mr0
* commit '
28b3fd136d713b4d94fc72113e1ff42637374d2a':
Correctly updating Roboto HHEA table
Dianne Hackborn [Fri, 28 Oct 2011 02:08:18 +0000 (02:08 +0000)]
am
ea1db611: Fix build. Forgot to add files. :(
* commit '
ea1db611b493d70e82641f8dc01d4a4c4ffcd3e7':
Fix build. Forgot to add files. :(
Dianne Hackborn [Fri, 28 Oct 2011 01:37:40 +0000 (01:37 +0000)]
am
114ac293: Merge "New framework performance tests." into ics-mr1
* commit '
114ac293b8df1e1db817603bcb77507451e87cd4':
New framework performance tests.
Dianne Hackborn [Fri, 28 Oct 2011 01:34:04 +0000 (18:34 -0700)]
Merge "New framework performance tests." into ics-mr1
Daniel Sandler [Fri, 28 Oct 2011 00:59:12 +0000 (00:59 +0000)]
am
d939dd2e: Merge "Fix race condition in status bar init code." into ics-mr1
* commit '
d939dd2eaacbe898dc82170a4b41a7248fe182e6':
Fix race condition in status bar init code.
Daniel Sandler [Fri, 28 Oct 2011 00:54:50 +0000 (17:54 -0700)]
Merge "Fix race condition in status bar init code." into ics-mr1
Jake Hamby [Fri, 28 Oct 2011 00:46:32 +0000 (17:46 -0700)]
Merge "Fix bug in enabling/disabling SMS cell broadcast activation." into ics-mr0
The Android Automerger [Fri, 28 Oct 2011 00:42:17 +0000 (17:42 -0700)]
Revert "Clean up CursorWindow code."
This reverts commit
3bc6bbc92cd2095f42039b5aadd0a14d0e5d9230.
The Android Automerger [Fri, 28 Oct 2011 00:41:26 +0000 (17:41 -0700)]
Revert "Fix regression in CursorWindow.copyStingToBuffer."
This reverts commit
d0ff68da6a606602235fb8749473999e3d1bde53.
The Android Automerger [Fri, 28 Oct 2011 00:39:53 +0000 (17:39 -0700)]
Revert "Use ashmem for CursorWindows."
This reverts commit
0cde89f5f025b7826be009ebb9673b970e180e32.
Justin Ho [Thu, 27 Oct 2011 23:37:02 +0000 (16:37 -0700)]
Merge "Increase navigation icon brightness by 10%" into ics-mr0
Justin Ho [Thu, 27 Oct 2011 23:36:52 +0000 (16:36 -0700)]
Merge "Increase notification icon brightness" into ics-mr0
Mangesh Ghiware [Thu, 27 Oct 2011 23:15:58 +0000 (23:15 +0000)]
am
ade26e2e: Merge "Fix restore of view and text wrap scales." into ics-mr1
* commit '
ade26e2e383cd0041f8aa94467d119c2bd1ee5e8':
Fix restore of view and text wrap scales.
Mangesh Ghiware [Thu, 27 Oct 2011 23:11:32 +0000 (16:11 -0700)]
Merge "Fix restore of view and text wrap scales." into ics-mr1
Jamie Gennis [Thu, 27 Oct 2011 23:04:45 +0000 (16:04 -0700)]
Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0
Robert Greenwalt [Thu, 27 Oct 2011 22:43:47 +0000 (15:43 -0700)]
Merge "Temp disable Tethering if DUN is required" into ics-mr0
Mathias Agopian [Thu, 27 Oct 2011 22:41:29 +0000 (22:41 +0000)]
am
7165b92e: Merge "fix Corrupted graphics while playing You Tube on orientation change" into ics-mr1
* commit '
7165b92e71bc6a1a741a53dc7968af88e7958f39':
fix Corrupted graphics while playing You Tube on orientation change
Mathias Agopian [Thu, 27 Oct 2011 22:37:33 +0000 (15:37 -0700)]
Merge "fix Corrupted graphics while playing You Tube on orientation change" into ics-mr1
James Dong [Thu, 27 Oct 2011 22:28:08 +0000 (22:28 +0000)]
am
da57c0e8: Merge "Report call status from AudioSource::start() to file writer" into ics-mr1
* commit '
da57c0e8cf7e5022dd927b51fab3c1a40a8adf54':
Report call status from AudioSource::start() to file writer
Justin Ho [Thu, 27 Oct 2011 22:26:42 +0000 (15:26 -0700)]
Merge "Correctly updating Roboto HHEA table" into ics-mr0
Bart Sears [Thu, 27 Oct 2011 22:25:47 +0000 (22:25 +0000)]
am
88fbb19a: am
777e682f: Merge "Add Lohit-Tamil.ttf and Lohit-Bengali.ttf to Fallback list" into ics-mr0
* commit '
88fbb19a55d17803bbf474c80707730b8de200e4':
Add Lohit-Tamil.ttf and Lohit-Bengali.ttf to Fallback list
James Dong [Thu, 27 Oct 2011 22:24:28 +0000 (15:24 -0700)]
Merge "Report call status from AudioSource::start() to file writer" into ics-mr1
Bart Sears [Thu, 27 Oct 2011 22:21:34 +0000 (22:21 +0000)]
am
777e682f: Merge "Add Lohit-Tamil.ttf and Lohit-Bengali.ttf to Fallback list" into ics-mr0
* commit '
777e682f13c8874f60ca21cb9264ae26a9d19a40':
Add Lohit-Tamil.ttf and Lohit-Bengali.ttf to Fallback list
Bart Sears [Thu, 27 Oct 2011 22:20:12 +0000 (15:20 -0700)]
Merge "Add Lohit-Tamil.ttf and Lohit-Bengali.ttf to Fallback list" into ics-mr0
Michael Jurka [Thu, 27 Oct 2011 21:59:30 +0000 (21:59 +0000)]
am
c4f09e03: Merge "Fix recents button on large devices (
5490265)" into ics-mr1
* commit '
c4f09e03099cddc57aa5b777921182ab1d13ae8a':
Fix recents button on large devices (
5490265)
Michael Jurka [Thu, 27 Oct 2011 21:55:37 +0000 (14:55 -0700)]
Merge "Fix recents button on large devices (
5490265)" into ics-mr1
Eric Fischer [Thu, 27 Oct 2011 21:54:11 +0000 (21:54 +0000)]
am
d01b6451: (-s ours) am
60912254: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
d01b6451c6caaf33b827a3eeee10b0f54dd93650':
Import revised translations. DO NOT MERGE
Robert Greenwalt [Thu, 27 Oct 2011 21:54:09 +0000 (21:54 +0000)]
am
52201ae5: am
8d059ac5: Merge "Fix Tethering settings." into ics-mr0
* commit '
52201ae5421b1efed2568109f3fc37462fdb7c35':
Fix Tethering settings.
Svetoslav Ganov [Thu, 27 Oct 2011 21:52:51 +0000 (14:52 -0700)]
Merge "Minor documentation fixes for the APIs to expose virtual view tree."
Scott Main [Thu, 27 Oct 2011 21:47:51 +0000 (21:47 +0000)]
am
b4e50fe0: Merge "resolved conflicts for merge of
b6cf4b7f to ics-mr1" into ics-mr1
* commit '
b4e50fe03c269e0c6b60db1702993ac0649bb5a2':
docs: quick update for fragments guide to consider handsets and new figure (bigger update coming later)
Eric Fischer [Thu, 27 Oct 2011 21:46:42 +0000 (21:46 +0000)]
am
60912254: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
60912254972abee324f10f57b0093732aa01adb8':
Import revised translations. DO NOT MERGE
Robert Greenwalt [Thu, 27 Oct 2011 21:46:35 +0000 (21:46 +0000)]
am
8d059ac5: Merge "Fix Tethering settings." into ics-mr0
* commit '
8d059ac5b186547a86bb92678c7d1cb13fd8ce1c':
Fix Tethering settings.
RoboErik [Thu, 27 Oct 2011 21:45:44 +0000 (21:45 +0000)]
am
8805dc13: Merge "b/
5309787 Add new columns to hidden list of read only fields" into ics-mr1
* commit '
8805dc137ad2c254f25117a5eb1fd662a4ef63b0':
b/
5309787 Add new columns to hidden list of read only fields
Scott Main [Thu, 27 Oct 2011 21:43:50 +0000 (14:43 -0700)]
Merge "resolved conflicts for merge of
b6cf4b7f to ics-mr1" into ics-mr1
RoboErik [Thu, 27 Oct 2011 21:41:03 +0000 (14:41 -0700)]
Merge "b/
5309787 Add new columns to hidden list of read only fields" into ics-mr1
Scott Main [Thu, 27 Oct 2011 21:40:53 +0000 (14:40 -0700)]
resolved conflicts for merge of
b6cf4b7f to ics-mr1
Change-Id: Ie5b151ad0dbaf6577b836f10f74181b898f26320
James Dong [Thu, 27 Oct 2011 21:13:54 +0000 (21:13 +0000)]
am
17a5fb36: Merge "Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording." into ics-mr1
* commit '
17a5fb36f88d90e30fd656d0d93b540ec2e2b84a':
Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording.