OSDN Git Service

android-x86/frameworks-native.git
12 years agoMerge "Notify a Bitmap is has changed when calling copyPixelFromBuffer"
Romain Guy [Wed, 19 Oct 2011 00:57:22 +0000 (17:57 -0700)]
Merge "Notify a Bitmap is has changed when calling copyPixelFromBuffer"

12 years agoam f49ee00f: Merge "docs: fix platform highlights" into ics-mr0
Scott Main [Wed, 19 Oct 2011 00:51:42 +0000 (17:51 -0700)]
am f49ee00f: Merge "docs: fix platform highlights" into ics-mr0

* commit 'f49ee00f9e1975887142695e0040cd5dc410b9db':
  docs: fix platform highlights

12 years agoam 06398768: Merge "Fix 5288804: Make music trasports in lockscreen more closely...
Jim Miller [Wed, 19 Oct 2011 00:51:41 +0000 (17:51 -0700)]
am 06398768: Merge "Fix 5288804: Make music trasports in lockscreen more closely match design" into ics-mr0

* commit '06398768ec048cf05717ee44b81cb357fdc896dd':
  Fix 5288804: Make music trasports in lockscreen more closely match design

12 years agoMerge "docs: fix platform highlights" into ics-mr0
Scott Main [Wed, 19 Oct 2011 00:49:32 +0000 (17:49 -0700)]
Merge "docs: fix platform highlights" into ics-mr0

12 years agoMerge "Fix 5288804: Make music trasports in lockscreen more closely match design...
Jim Miller [Wed, 19 Oct 2011 00:49:28 +0000 (17:49 -0700)]
Merge "Fix 5288804: Make music trasports in lockscreen more closely match design" into ics-mr0

12 years agoMerge "Add mandelbrot to compute perf"
Jason Sams [Wed, 19 Oct 2011 00:44:33 +0000 (17:44 -0700)]
Merge "Add mandelbrot to compute perf"

12 years agoam 4de8cb50: Merge "docs: update homepage for ICS announcement" into ics-mr0
Scott Main [Wed, 19 Oct 2011 00:36:15 +0000 (17:36 -0700)]
am 4de8cb50: Merge "docs: update homepage for ICS announcement" into ics-mr0

* commit '4de8cb509bfefb920b6696209f659810dfd06e6e':
  docs: update homepage for ICS announcement

12 years agoMerge "docs: update homepage for ICS announcement" into ics-mr0
Scott Main [Wed, 19 Oct 2011 00:34:23 +0000 (17:34 -0700)]
Merge "docs: update homepage for ICS announcement" into ics-mr0

12 years agoam 8f8e14c1: Merge "docs: change compatibility package to support package and update...
Robert Ly [Wed, 19 Oct 2011 00:26:06 +0000 (17:26 -0700)]
am 8f8e14c1: Merge "docs: change compatibility package to support package and update rel notes for r4" into ics-mr0

* commit '8f8e14c11c9680f5c62245f3fcc3774f8d23c05a':
  docs: change compatibility package to support package and update rel notes for r4

12 years agoMerge "docs: change compatibility package to support package and update rel notes...
Robert Ly [Wed, 19 Oct 2011 00:24:02 +0000 (17:24 -0700)]
Merge "docs: change compatibility package to support package and update rel notes for r4" into ics-mr0

12 years agoam 93f97f53: Merge "docs: rs link fixes" into ics-mr0
Robert Ly [Wed, 19 Oct 2011 00:23:11 +0000 (17:23 -0700)]
am 93f97f53: Merge "docs: rs link fixes" into ics-mr0

* commit '93f97f53df964ec11628bf58621a1594d24e8cd7':
  docs: rs link fixes

12 years agoam 90889821: Merge "docs: fix misc broken links" into ics-mr0
Scott Main [Wed, 19 Oct 2011 00:21:12 +0000 (17:21 -0700)]
am 90889821: Merge "docs: fix misc broken links" into ics-mr0

* commit '90889821f1a5b1db3da8341156e9da9d2fc8f484':
  docs: fix misc broken links

12 years agoMerge "docs: rs link fixes" into ics-mr0
Robert Ly [Wed, 19 Oct 2011 00:20:57 +0000 (17:20 -0700)]
Merge "docs: rs link fixes" into ics-mr0

12 years agoMerge "docs: fix misc broken links" into ics-mr0
Scott Main [Wed, 19 Oct 2011 00:19:14 +0000 (17:19 -0700)]
Merge "docs: fix misc broken links" into ics-mr0

12 years agoam 49dfd814: Merge "Find on page asset update" into ics-mr0
John Reck [Tue, 18 Oct 2011 23:39:39 +0000 (16:39 -0700)]
am 49dfd814: Merge "Find on page asset update" into ics-mr0

* commit '49dfd814acef0c4b3bc9e408969d5ffa99883664':
  Find on page asset update

12 years agoMerge "Find on page asset update" into ics-mr0
John Reck [Tue, 18 Oct 2011 23:37:03 +0000 (16:37 -0700)]
Merge "Find on page asset update" into ics-mr0

12 years agoMerge "Import revised translations."
Eric Fischer [Tue, 18 Oct 2011 23:27:32 +0000 (16:27 -0700)]
Merge "Import revised translations."

12 years agoMerge "Fix full backup of shared storage"
Christopher Tate [Tue, 18 Oct 2011 23:19:37 +0000 (16:19 -0700)]
Merge "Fix full backup of shared storage"

12 years agoam a25a9975: Merge "docs: more ics overview changes... reorg a few sections, revise...
Scott Main [Tue, 18 Oct 2011 22:58:21 +0000 (15:58 -0700)]
am a25a9975: Merge "docs: more ics overview changes... reorg a few sections, revise intro paragraph also update API levels doc with ICS version add info about system themes and using an options menu button" into ics-mr0

* commit 'a25a99759774206ec8712af95bba9aec47034e0e':
  docs: more ics overview changes... reorg a few sections, revise intro paragraph also update API levels doc with ICS version add info about system themes and using an options menu button

12 years agoam 35f78f30: Merge "docs: add package summary for spell checker services" into ics-mr0
Scott Main [Tue, 18 Oct 2011 22:55:33 +0000 (15:55 -0700)]
am 35f78f30: Merge "docs: add package summary for spell checker services" into ics-mr0

* commit '35f78f30f39832ca8f6cd21140d501c53a2aa826':
  docs: add package summary for spell checker services

12 years agoMerge "docs: more ics overview changes... reorg a few sections, revise intro paragrap...
Scott Main [Tue, 18 Oct 2011 22:55:25 +0000 (15:55 -0700)]
Merge "docs: more ics overview changes... reorg a few sections, revise intro paragraph also update API levels doc with ICS version add info about system themes and using an options menu button" into ics-mr0

12 years agoMerge "docs: add package summary for spell checker services" into ics-mr0
Scott Main [Tue, 18 Oct 2011 22:54:04 +0000 (15:54 -0700)]
Merge "docs: add package summary for spell checker services" into ics-mr0

12 years agoam 2720cfae: Merge "Fix 5433466 - FU out of position during orientation change" into...
Brian Colonna [Tue, 18 Oct 2011 22:49:12 +0000 (15:49 -0700)]
am 2720cfae: Merge "Fix 5433466 - FU out of position during orientation change" into ics-mr0

* commit '2720cfae624770674122640f2d4a3f55702d80ff':
  Fix 5433466 - FU out of position during orientation change

12 years agoMerge "Fix 5433466 - FU out of position during orientation change" into ics-mr0
Brian Colonna [Tue, 18 Oct 2011 22:46:54 +0000 (15:46 -0700)]
Merge "Fix 5433466 - FU out of position during orientation change" into ics-mr0

12 years agoam ee5aa0e8: (-s ours) Merge "DO NOT MERGE. Updating screenshot notification strings...
Winson Chung [Tue, 18 Oct 2011 22:45:55 +0000 (15:45 -0700)]
am ee5aa0e8: (-s ours) Merge "DO NOT MERGE.  Updating screenshot notification strings. (Bug: 5333706)" into ics-mr0

* commit 'ee5aa0e867657f06b63f1582f23af1cc1799f19a':
  DO NOT MERGE.  Updating screenshot notification strings. (Bug: 5333706)

12 years agoam 9beac371: Merge "Fixing issue where screenshot intent to file path did not show...
Winson Chung [Tue, 18 Oct 2011 22:45:53 +0000 (15:45 -0700)]
am 9beac371: Merge "Fixing issue where screenshot intent to file path did not show other screenshots. (Bug: 5333706)" into ics-mr0

* commit '9beac371dd3f3977c3e0ab471a776a5191590f63':
  Fixing issue where screenshot intent to file path did not show other screenshots. (Bug: 5333706)

12 years agoMerge "DO NOT MERGE. Updating screenshot notification strings. (Bug: 5333706)" into...
Winson Chung [Tue, 18 Oct 2011 22:44:04 +0000 (15:44 -0700)]
Merge "DO NOT MERGE.  Updating screenshot notification strings. (Bug: 5333706)" into ics-mr0

12 years agoMerge "Fixing issue where screenshot intent to file path did not show other screensho...
Winson Chung [Tue, 18 Oct 2011 22:44:01 +0000 (15:44 -0700)]
Merge "Fixing issue where screenshot intent to file path did not show other screenshots. (Bug: 5333706)" into ics-mr0

12 years agoam f13313a0: Merge "Fix 5452698: fix broken logic in reportFailedAttempt() in lockscr...
Jim Miller [Tue, 18 Oct 2011 22:12:02 +0000 (15:12 -0700)]
am f13313a0: Merge "Fix 5452698: fix broken logic in reportFailedAttempt() in lockscreen" into ics-mr0

* commit 'f13313a073ad3f3c4e91baa4adbfdec66395065e':
  Fix 5452698: fix broken logic in reportFailedAttempt() in lockscreen

12 years agoMerge "Fix 5452698: fix broken logic in reportFailedAttempt() in lockscreen" into...
Jim Miller [Tue, 18 Oct 2011 22:10:04 +0000 (15:10 -0700)]
Merge "Fix 5452698: fix broken logic in reportFailedAttempt() in lockscreen" into ics-mr0

12 years agoam 3f70aa78: Merge "docs: Camera JavaDoc - added xref to Camera DevGuide" into ics-mr0
Joe Fernandez [Tue, 18 Oct 2011 22:03:23 +0000 (15:03 -0700)]
am 3f70aa78: Merge "docs: Camera JavaDoc - added xref to Camera DevGuide" into ics-mr0

* commit '3f70aa783cca9f4c331c2a1b390bb7bebc6e248c':
  docs: Camera JavaDoc - added xref to Camera DevGuide

12 years agoMerge "docs: Camera JavaDoc - added xref to Camera DevGuide" into ics-mr0
Joe Fernandez [Tue, 18 Oct 2011 22:02:00 +0000 (15:02 -0700)]
Merge "docs: Camera JavaDoc - added xref to Camera DevGuide" into ics-mr0

12 years agoam 6d076a42: Merge "fix bug where the instance saving of the ChooseTypeAndAccountActi...
Fred Quintana [Tue, 18 Oct 2011 21:45:35 +0000 (14:45 -0700)]
am 6d076a42: Merge "fix bug where the instance saving of the ChooseTypeAndAccountActivity would only work in the case where onSaveInstanceState was called." into ics-mr0

* commit '6d076a425ab10441996ebe194b0c181d16912ece':
  fix bug where the instance saving of the ChooseTypeAndAccountActivity would only work in the case where onSaveInstanceState was called.

12 years agoMerge "fix bug where the instance saving of the ChooseTypeAndAccountActivity would...
Fred Quintana [Tue, 18 Oct 2011 21:43:06 +0000 (14:43 -0700)]
Merge "fix bug where the instance saving of the ChooseTypeAndAccountActivity would only work in the case where onSaveInstanceState was called." into ics-mr0

12 years agoam 535f6eac: Merge "Fix issue #5461497: Landed on Welcome screen after a tap on ...
Dianne Hackborn [Tue, 18 Oct 2011 21:36:31 +0000 (14:36 -0700)]
am 535f6eac: Merge "Fix issue #5461497: Landed on Welcome screen after a tap on \'Next\' in Screen 500" into ics-mr0

* commit '535f6eacb9bd508caac463a12ab69be1cd58c5a5':
  Fix issue #5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500

12 years agoMerge "Fix issue #5461497: Landed on Welcome screen after a tap on 'Next' in Screen...
Dianne Hackborn [Tue, 18 Oct 2011 21:34:08 +0000 (14:34 -0700)]
Merge "Fix issue #5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500" into ics-mr0

12 years agoMerge "Update comment on required fields for an event"
Michael Chan [Tue, 18 Oct 2011 21:33:10 +0000 (14:33 -0700)]
Merge "Update comment on required fields for an event"

12 years agoam dd466152: Merge "Initialize Hipri correctly." into ics-mr0
Robert Greenwalt [Tue, 18 Oct 2011 21:31:47 +0000 (14:31 -0700)]
am dd466152: Merge "Initialize Hipri correctly." into ics-mr0

* commit 'dd466152dd1b88f7b5bd73c47715eb84b76e6dab':
  Initialize Hipri correctly.

12 years agoMerge "Initialize Hipri correctly." into ics-mr0
Robert Greenwalt [Tue, 18 Oct 2011 21:29:50 +0000 (14:29 -0700)]
Merge "Initialize Hipri correctly." into ics-mr0

12 years agoam 87bc53de: Merge "Make notification panel delete-all animation smoother" into ics-mr0
Chet Haase [Tue, 18 Oct 2011 20:46:45 +0000 (13:46 -0700)]
am 87bc53de: Merge "Make notification panel delete-all animation smoother" into ics-mr0

* commit '87bc53de2adf479ad5a5e226bf3d8fd31af6dc21':
  Make notification panel delete-all animation smoother

12 years agoMerge "Make notification panel delete-all animation smoother" into ics-mr0
Chet Haase [Tue, 18 Oct 2011 20:45:00 +0000 (13:45 -0700)]
Merge "Make notification panel delete-all animation smoother" into ics-mr0

12 years agoam 07848843: Merge "Add DataConnection#isEmergency and use in trySetupData." into...
Wink Saville [Tue, 18 Oct 2011 20:38:09 +0000 (13:38 -0700)]
am 07848843: Merge "Add DataConnection#isEmergency and use in trySetupData." into ics-mr0

* commit '07848843b23e10e4728fa779cc79fc38a341cf6b':
  Add DataConnection#isEmergency and use in trySetupData.

12 years agoMerge "Add DataConnection#isEmergency and use in trySetupData." into ics-mr0
Wink Saville [Tue, 18 Oct 2011 20:35:43 +0000 (13:35 -0700)]
Merge "Add DataConnection#isEmergency and use in trySetupData." into ics-mr0

12 years agoam 8e6d75af: Merge "Fix 5473038: workaround for fd leak in lockscreen" into ics-mr0
Jim Miller [Tue, 18 Oct 2011 20:12:10 +0000 (13:12 -0700)]
am 8e6d75af: Merge "Fix 5473038: workaround for fd leak in lockscreen" into ics-mr0

* commit '8e6d75affa1a802b01aa38ad765d1ae9f998c0ab':
  Fix 5473038: workaround for fd leak in lockscreen

12 years agoMerge "Fix 5473038: workaround for fd leak in lockscreen" into ics-mr0
Jim Miller [Tue, 18 Oct 2011 20:10:24 +0000 (13:10 -0700)]
Merge "Fix 5473038: workaround for fd leak in lockscreen" into ics-mr0

12 years agoam f522e095: Merge "Add wrapper method to GsmAlphabet for API compatibility." into...
Jake Hamby [Tue, 18 Oct 2011 19:24:25 +0000 (12:24 -0700)]
am f522e095: Merge "Add wrapper method to GsmAlphabet for API compatibility." into ics-mr0

* commit 'f522e095e69406a5c6039b406237e9b30781a355':
  Add wrapper method to GsmAlphabet for API compatibility.

12 years agoMerge "Add wrapper method to GsmAlphabet for API compatibility." into ics-mr0
Jake Hamby [Tue, 18 Oct 2011 19:22:39 +0000 (12:22 -0700)]
Merge "Add wrapper method to GsmAlphabet for API compatibility." into ics-mr0

12 years agoam 601d5817: Merge "TouchExplorer crashes if there is incative pointer while dragging...
Svetoslav Ganov [Tue, 18 Oct 2011 18:54:03 +0000 (11:54 -0700)]
am 601d5817: Merge "TouchExplorer crashes if there is incative pointer while dragging." into ics-mr0

* commit '601d5817301bc79c34c30e7b606fe872b2b76c31':
  TouchExplorer crashes if there is incative pointer while dragging.

12 years agoam 6d9d17fd: Merge "Visual changes to recent apps" into ics-mr0
Michael Jurka [Tue, 18 Oct 2011 18:51:52 +0000 (11:51 -0700)]
am 6d9d17fd: Merge "Visual changes to recent apps" into ics-mr0

* commit '6d9d17fdd299642330dac321a9fa4099abaae220':
  Visual changes to recent apps

12 years agoMerge "TouchExplorer crashes if there is incative pointer while dragging." into ics-mr0
Svetoslav Ganov [Tue, 18 Oct 2011 18:51:29 +0000 (11:51 -0700)]
Merge "TouchExplorer crashes if there is incative pointer while dragging." into ics-mr0

12 years agoMerge "Visual changes to recent apps" into ics-mr0
Michael Jurka [Tue, 18 Oct 2011 18:49:57 +0000 (11:49 -0700)]
Merge "Visual changes to recent apps" into ics-mr0

12 years agoam d6462ab5: Merge "docs: fix mistakes" into ics-mr0
Robert Ly [Tue, 18 Oct 2011 18:33:37 +0000 (11:33 -0700)]
am d6462ab5: Merge "docs: fix mistakes" into ics-mr0

* commit 'd6462ab5472341f7b8ded552f2440c21baaa3873':
  docs: fix mistakes

12 years agoam 3c44e8d2: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Tue, 18 Oct 2011 18:31:18 +0000 (11:31 -0700)]
am 3c44e8d2: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

* commit '3c44e8d22cf995821cc79dbe77a1b587aac7a3d7':
  Import revised translations.  DO NOT MERGE

12 years agoMerge "docs: fix mistakes" into ics-mr0
Robert Ly [Tue, 18 Oct 2011 18:30:35 +0000 (11:30 -0700)]
Merge "docs: fix mistakes" into ics-mr0

12 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Tue, 18 Oct 2011 18:29:34 +0000 (11:29 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

12 years agoam 5310a731: Merge "Updating screenshot animation and behaviour. (Bug: 5333706)"...
Winson Chung [Tue, 18 Oct 2011 18:19:55 +0000 (11:19 -0700)]
am 5310a731: Merge "Updating screenshot animation and behaviour. (Bug: 5333706)" into ics-mr0

* commit '5310a731eab664352044781d4b107b4837ea77ac':
  Updating screenshot animation and behaviour. (Bug: 5333706)

12 years agoMerge "Updating screenshot animation and behaviour. (Bug: 5333706)" into ics-mr0
Winson Chung [Tue, 18 Oct 2011 18:17:24 +0000 (11:17 -0700)]
Merge "Updating screenshot animation and behaviour. (Bug: 5333706)" into ics-mr0

12 years agoam 1ff39212: Merge "cherrypick from master - docs: nfc updates Change-Id: Iaa782911f1...
Robert Ly [Tue, 18 Oct 2011 18:12:28 +0000 (11:12 -0700)]
am 1ff39212: Merge "cherrypick from master - docs: nfc updates Change-Id: Iaa782911f14b11bc896ac9ef06db2c43104d1dac" into ics-mr0

* commit '1ff392128dfb802fe58e90ba23ed6138b1cd1a64':
  cherrypick from master - docs: nfc updates Change-Id: Iaa782911f14b11bc896ac9ef06db2c43104d1dac

12 years agoMerge "cherrypick from master - docs: nfc updates Change-Id: Iaa782911f14b11bc896ac9e...
Robert Ly [Tue, 18 Oct 2011 18:11:05 +0000 (11:11 -0700)]
Merge "cherrypick from master - docs: nfc updates Change-Id: Iaa782911f14b11bc896ac9ef06db2c43104d1dac" into ics-mr0

12 years agoMerge "Update to hidden APIs"
RoboErik [Tue, 18 Oct 2011 17:47:50 +0000 (10:47 -0700)]
Merge "Update to hidden APIs"

12 years agoam 2bd3c2f7: Merge "Fix null ptr exception in getReadingLevelScale()" into ics-mr0
Mangesh Ghiware [Tue, 18 Oct 2011 17:32:36 +0000 (10:32 -0700)]
am 2bd3c2f7: Merge "Fix null ptr exception in getReadingLevelScale()" into ics-mr0

* commit '2bd3c2f7e89eb02f2b240672631c57bc912a9575':
  Fix null ptr exception in getReadingLevelScale()

12 years agoMerge "Fix null ptr exception in getReadingLevelScale()" into ics-mr0
Mangesh Ghiware [Tue, 18 Oct 2011 17:31:15 +0000 (10:31 -0700)]
Merge "Fix null ptr exception in getReadingLevelScale()" into ics-mr0

12 years agoam dba69061: Merge "Send availability info more reliably" into ics-mr0
Robert Greenwalt [Tue, 18 Oct 2011 16:44:22 +0000 (09:44 -0700)]
am dba69061: Merge "Send availability info more reliably" into ics-mr0

* commit 'dba69061a6e9c25d968819cee47ab13e5b554b9a':
  Send availability info more reliably

12 years agoMerge "Send availability info more reliably" into ics-mr0
Robert Greenwalt [Tue, 18 Oct 2011 16:42:33 +0000 (09:42 -0700)]
Merge "Send availability info more reliably" into ics-mr0

12 years agoam a548b5cb: Merge "Removing Testudo and adding Themos ringtone Bug: 5416299" into...
Justin Ho [Tue, 18 Oct 2011 16:33:10 +0000 (09:33 -0700)]
am a548b5cb: Merge "Removing Testudo and adding Themos ringtone Bug: 5416299" into ics-mr0

* commit 'a548b5cb82008d2d6629ab78ba775a24bff55040':
  Removing Testudo and adding Themos ringtone Bug: 5416299

12 years agoMerge "Removing Testudo and adding Themos ringtone Bug: 5416299" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 16:31:01 +0000 (09:31 -0700)]
Merge "Removing Testudo and adding Themos ringtone Bug: 5416299" into ics-mr0

12 years agoam b7ad8253: Merge "Add documents for the spell checker framework and the input metho...
satok [Tue, 18 Oct 2011 16:17:31 +0000 (09:17 -0700)]
am b7ad8253: Merge "Add documents for the spell checker framework and the input method subtype" into ics-mr0

* commit 'b7ad82533596b73ecd40f22bfe48b1b785b05068':
  Add documents for the spell checker framework and the input method subtype

12 years agoMerge "Add documents for the spell checker framework and the input method subtype...
satok [Tue, 18 Oct 2011 16:15:48 +0000 (09:15 -0700)]
Merge "Add documents for the spell checker framework and the input method subtype" into ics-mr0

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Tue, 18 Oct 2011 14:31:56 +0000 (07:31 -0700)]
Reconcile with ics-mr0-release

Change-Id: Ife215fa3762b795be28dfe472095c5e7e0b7624f

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Tue, 18 Oct 2011 13:28:19 +0000 (06:28 -0700)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoam 11116b80: Merge "Disconnect without CTRL-EVENT-DISCONNECTED" into ics-mr0
Irfan Sheriff [Tue, 18 Oct 2011 03:33:07 +0000 (20:33 -0700)]
am 11116b80: Merge "Disconnect without CTRL-EVENT-DISCONNECTED" into ics-mr0

* commit '11116b80d88b72e14e4f6b7ad3ab312096f8eea5':
  Disconnect without CTRL-EVENT-DISCONNECTED

12 years agoMerge "Disconnect without CTRL-EVENT-DISCONNECTED" into ics-mr0
Irfan Sheriff [Tue, 18 Oct 2011 03:31:50 +0000 (20:31 -0700)]
Merge "Disconnect without CTRL-EVENT-DISCONNECTED" into ics-mr0

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Tue, 18 Oct 2011 03:08:56 +0000 (20:08 -0700)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoam c0a87dc1: Merge "Fix issue 5462427: Volume should never be 0 ..." into ics-mr0
Eric Laurent [Tue, 18 Oct 2011 02:50:36 +0000 (19:50 -0700)]
am c0a87dc1: Merge "Fix issue 5462427: Volume should never be 0 ..." into ics-mr0

* commit 'c0a87dc10cc74918518457e96b48f16bcc0ea2cd':
  Fix issue 5462427: Volume should never be 0 ...

12 years agoMerge "Fix issue 5462427: Volume should never be 0 ..." into ics-mr0
Eric Laurent [Tue, 18 Oct 2011 02:48:31 +0000 (19:48 -0700)]
Merge "Fix issue 5462427: Volume should never be 0 ..." into ics-mr0

12 years agoam a84e37f3: Merge "Fix 5468644: Use the proper audio stream type to play sound....
Chih-Chung Chang [Tue, 18 Oct 2011 02:42:14 +0000 (19:42 -0700)]
am a84e37f3: Merge "Fix 5468644: Use the proper audio stream type to play sound." into ics-mr0

* commit 'a84e37f37c7cd21fe498a923c181d3896e055d56':
  Fix 5468644: Use the proper audio stream type to play sound.

12 years agoMerge "Fix 5468644: Use the proper audio stream type to play sound." into ics-mr0
Chih-Chung Chang [Tue, 18 Oct 2011 02:40:12 +0000 (19:40 -0700)]
Merge "Fix 5468644: Use the proper audio stream type to play sound." into ics-mr0

12 years agoam 6f13adb2: Merge "Don\'t hold onto the lock while reconnecting to the server" into...
Dave Burke [Tue, 18 Oct 2011 01:36:48 +0000 (18:36 -0700)]
am 6f13adb2: Merge "Don\'t hold onto the lock while reconnecting to the server" into ics-mr0

* commit '6f13adb22afcb47a1cd45a90eaa3c154522089d4':
  Don't hold onto the lock while reconnecting to the server

12 years agoMerge "Don't hold onto the lock while reconnecting to the server" into ics-mr0
Dave Burke [Tue, 18 Oct 2011 01:35:11 +0000 (18:35 -0700)]
Merge "Don't hold onto the lock while reconnecting to the server" into ics-mr0

12 years agoam 9a7e4ce7: Merge "Fix 5466678: use new setSystemUiVisibility() API to enable clock...
Jim Miller [Tue, 18 Oct 2011 01:06:08 +0000 (18:06 -0700)]
am 9a7e4ce7: Merge "Fix 5466678: use new setSystemUiVisibility() API to enable clock in statusbar" into ics-mr0

* commit '9a7e4ce72a1f97832e71386ad023439ed9b179bd':
  Fix 5466678: use new setSystemUiVisibility() API to enable clock in statusbar

12 years agoMerge "Fix 5466678: use new setSystemUiVisibility() API to enable clock in statusbar...
Jim Miller [Tue, 18 Oct 2011 01:03:38 +0000 (18:03 -0700)]
Merge "Fix 5466678: use new setSystemUiVisibility() API to enable clock in statusbar" into ics-mr0

12 years agoam 7788c51d: Merge "Fix onFirstLayout path for saved pages" into ics-mr0
John Reck [Tue, 18 Oct 2011 00:50:39 +0000 (17:50 -0700)]
am 7788c51d: Merge "Fix onFirstLayout path for saved pages" into ics-mr0

* commit '7788c51d82963a8645655675c675424db694ad85':
  Fix onFirstLayout path for saved pages

12 years agoMerge "Fix onFirstLayout path for saved pages" into ics-mr0
John Reck [Tue, 18 Oct 2011 00:48:58 +0000 (17:48 -0700)]
Merge "Fix onFirstLayout path for saved pages" into ics-mr0

12 years agoam f129988a: Merge "Bullet points updated and permission colors are not orange" into...
Peter Ng [Tue, 18 Oct 2011 00:26:10 +0000 (17:26 -0700)]
am f129988a: Merge "Bullet points updated and permission colors are not orange" into ics-mr0

* commit 'f129988a1aa8a210dc125b0f427d848a2aeb8bb2':
  Bullet points updated and permission colors are not orange

12 years agoMerge "Bullet points updated and permission colors are not orange" into ics-mr0
Peter Ng [Tue, 18 Oct 2011 00:24:32 +0000 (17:24 -0700)]
Merge "Bullet points updated and permission colors are not orange" into ics-mr0

12 years agoam e95a1190: Merge "Update unlock halo asset" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:23:15 +0000 (17:23 -0700)]
am e95a1190: Merge "Update unlock halo asset" into ics-mr0

* commit 'e95a1190ff9e15ac0924cd7f294cf6a486e3119f':
  Update unlock halo asset

12 years agoam 0f86772a: Merge "Update text select handles" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:23:14 +0000 (17:23 -0700)]
am 0f86772a: Merge "Update text select handles" into ics-mr0

* commit '0f86772ad7837a1b084bba7f8180f267e958a9b2':
  Update text select handles

12 years agoam c598fcf4: Merge "Update stat_sys icons with different resize method" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:23:12 +0000 (17:23 -0700)]
am c598fcf4: Merge "Update stat_sys icons with different resize method" into ics-mr0

* commit 'c598fcf4d24357628c56888440b39a130a36824a':
  Update stat_sys icons with different resize method

12 years agoam 49317b77: Merge "Update spinner assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:23:10 +0000 (17:23 -0700)]
am 49317b77: Merge "Update spinner assets" into ics-mr0

* commit '49317b77fddd03ed8a5bed520aefc248edfb9e14':
  Update spinner assets

12 years agoam 0c7020dd: Merge "Update scrubber assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:23:09 +0000 (17:23 -0700)]
am 0c7020dd: Merge "Update scrubber assets" into ics-mr0

* commit '0c7020dd524a8354ea11ffa2228ac6a930e5114b':
  Update scrubber assets

12 years agoam d864a503: Merge "Update rating stars" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:23:06 +0000 (17:23 -0700)]
am d864a503: Merge "Update rating stars" into ics-mr0

* commit 'd864a503c0ea201c12266ca2dc4da1ccc2d66e0b':
  Update rating stars

12 years agoam 488eddca: Merge "Update lockscreen assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:23:05 +0000 (17:23 -0700)]
am 488eddca: Merge "Update lockscreen assets" into ics-mr0

* commit '488eddca0f1b2fd824de52e0f38c90b2d129d3b0':
  Update lockscreen assets

12 years agoam e93f09d6: Merge "Update lockscreen assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:23:04 +0000 (17:23 -0700)]
am e93f09d6: Merge "Update lockscreen assets" into ics-mr0

* commit 'e93f09d66853f568eb253b458bd2cad2a34cb79a':
  Update lockscreen assets

12 years agoam 2076de1b: Merge "Update fastscroll assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:23:02 +0000 (17:23 -0700)]
am 2076de1b: Merge "Update fastscroll assets" into ics-mr0

* commit '2076de1b43bfff65635bd314bbaae0400afd091c':
  Update fastscroll assets

12 years agoam 8ffa1371: Merge "Update checkboxes" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:23:01 +0000 (17:23 -0700)]
am 8ffa1371: Merge "Update checkboxes" into ics-mr0

* commit '8ffa1371616eb8096e8063bdff3fef75f74efbc5':
  Update checkboxes

12 years agoMerge "Update unlock halo asset" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:21:47 +0000 (17:21 -0700)]
Merge "Update unlock halo asset" into ics-mr0

12 years agoMerge "Update text select handles" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:21:30 +0000 (17:21 -0700)]
Merge "Update text select handles" into ics-mr0

12 years agoMerge "Update stat_sys icons with different resize method" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:21:22 +0000 (17:21 -0700)]
Merge "Update stat_sys icons with different resize method" into ics-mr0

12 years agoMerge "Update spinner assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:21:15 +0000 (17:21 -0700)]
Merge "Update spinner assets" into ics-mr0

12 years agoMerge "Update scrubber assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:21:06 +0000 (17:21 -0700)]
Merge "Update scrubber assets" into ics-mr0