OSDN Git Service
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.
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
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
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
Michael Chan [Tue, 18 Oct 2011 21:33:10 +0000 (14:33 -0700)]
Merge "Update comment on required fields for an event"
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.
Robert Greenwalt [Tue, 18 Oct 2011 21:29:50 +0000 (14:29 -0700)]
Merge "Initialize Hipri correctly." 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
Chet Haase [Tue, 18 Oct 2011 20:45:00 +0000 (13:45 -0700)]
Merge "Make notification panel delete-all animation smoother" into ics-mr0
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.
Wink Saville [Tue, 18 Oct 2011 20:35:43 +0000 (13:35 -0700)]
Merge "Add DataConnection#isEmergency and use in trySetupData." 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
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
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.
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
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.
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
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
Michael Jurka [Tue, 18 Oct 2011 18:49:57 +0000 (11:49 -0700)]
Merge "Visual changes to recent apps" 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
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
Robert Ly [Tue, 18 Oct 2011 18:30:35 +0000 (11:30 -0700)]
Merge "docs: fix mistakes" 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
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)
Winson Chung [Tue, 18 Oct 2011 18:17:24 +0000 (11:17 -0700)]
Merge "Updating screenshot animation and behaviour. (Bug:
5333706)" into ics-mr0
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
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
RoboErik [Tue, 18 Oct 2011 17:47:50 +0000 (10:47 -0700)]
Merge "Update to hidden APIs"
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()
Mangesh Ghiware [Tue, 18 Oct 2011 17:31:15 +0000 (10:31 -0700)]
Merge "Fix null ptr exception in getReadingLevelScale()" 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
Robert Greenwalt [Tue, 18 Oct 2011 16:42:33 +0000 (09:42 -0700)]
Merge "Send availability info more reliably" into ics-mr0
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
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
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
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
The Android Open Source Project [Tue, 18 Oct 2011 14:31:56 +0000 (07:31 -0700)]
Reconcile with ics-mr0-release
Change-Id: Ife215fa3762b795be28dfe472095c5e7e0b7624f
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
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
Irfan Sheriff [Tue, 18 Oct 2011 03:31:50 +0000 (20:31 -0700)]
Merge "Disconnect without CTRL-EVENT-DISCONNECTED" into 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
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 ...
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
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.
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
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
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
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
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
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
John Reck [Tue, 18 Oct 2011 00:48:58 +0000 (17:48 -0700)]
Merge "Fix onFirstLayout path for saved pages" into ics-mr0
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
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
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
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
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
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
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
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
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
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
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
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
Justin Ho [Tue, 18 Oct 2011 00:21:47 +0000 (17:21 -0700)]
Merge "Update unlock halo asset" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:21:30 +0000 (17:21 -0700)]
Merge "Update text select handles" 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
Justin Ho [Tue, 18 Oct 2011 00:21:15 +0000 (17:21 -0700)]
Merge "Update spinner assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:21:06 +0000 (17:21 -0700)]
Merge "Update scrubber assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:20:57 +0000 (17:20 -0700)]
Merge "Update rating stars" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:20:49 +0000 (17:20 -0700)]
Merge "Update lockscreen assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:20:40 +0000 (17:20 -0700)]
Merge "Update lockscreen assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:20:32 +0000 (17:20 -0700)]
Merge "Update fastscroll assets" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:20:22 +0000 (17:20 -0700)]
Merge "Update checkboxes" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 00:19:31 +0000 (17:19 -0700)]
am
68bb87b9: Merge "Update stars" into ics-mr0
* commit '
68bb87b9f927555add2eb061510e54f477abcb29':
Update stars
Justin Ho [Tue, 18 Oct 2011 00:17:31 +0000 (17:17 -0700)]
Merge "Update stars" into ics-mr0
Romain Guy [Tue, 18 Oct 2011 00:11:08 +0000 (17:11 -0700)]
Merge "Return early when we cannot allocate a hardware layer Bug #
5462308"
Justin Ho [Mon, 17 Oct 2011 23:00:04 +0000 (16:00 -0700)]
am
3877089c: Merge "Update Settings Storage app icon" into ics-mr0
* commit '
3877089c8e40402bf3e0c236e8d7add6ce73fb11':
Update Settings Storage app icon
Justin Ho [Mon, 17 Oct 2011 22:57:39 +0000 (15:57 -0700)]
Merge "Update Settings Storage app icon" into ics-mr0
Justin Ho [Mon, 17 Oct 2011 22:54:25 +0000 (15:54 -0700)]
am
5f94580c: Merge "Update default app icon" into ics-mr0
* commit '
5f94580c93031c515fffb80a350430cd7bde434d':
Update default app icon
Robert Ly [Mon, 17 Oct 2011 22:54:24 +0000 (15:54 -0700)]
am
ffaab837: Merge "docs: adt and tools filesizes and md5sums" into ics-mr0
* commit '
ffaab837e7686fa81ab20e1fed32d33c684a295e':
docs: adt and tools filesizes and md5sums
Justin Ho [Mon, 17 Oct 2011 22:53:00 +0000 (15:53 -0700)]
Merge "Update default app icon" into ics-mr0
Robert Ly [Mon, 17 Oct 2011 22:52:51 +0000 (15:52 -0700)]
Merge "docs: adt and tools filesizes and md5sums" into ics-mr0
Mathias Agopian [Mon, 17 Oct 2011 22:52:31 +0000 (15:52 -0700)]
am
9a0732af: Merge "SensorManager reconnects to sensor service when the later dies" into ics-mr0
* commit '
9a0732af1bd96a7d8247dee124a7da389137a52f':
SensorManager reconnects to sensor service when the later dies
Mathias Agopian [Mon, 17 Oct 2011 22:50:36 +0000 (15:50 -0700)]
Merge "SensorManager reconnects to sensor service when the later dies" into ics-mr0
Jeff Sharkey [Mon, 17 Oct 2011 22:31:10 +0000 (15:31 -0700)]
am
31603aac: Merge "Validate commands and arguments." into ics-mr0
* commit '
31603aacbb54b98cbee498412f6a5eb9dd4a2788':
Validate commands and arguments.
Jeff Sharkey [Mon, 17 Oct 2011 22:29:25 +0000 (15:29 -0700)]
Merge "Validate commands and arguments." into ics-mr0
Dianne Hackborn [Mon, 17 Oct 2011 22:28:07 +0000 (15:28 -0700)]
am
5d199737: Merge "Fix stupid bug breaking touch on devices without a nav bar." into ics-mr0
* commit '
5d199737cb22733b065453ee95dfd9c9e5e87d5b':
Fix stupid bug breaking touch on devices without a nav bar.
Dianne Hackborn [Mon, 17 Oct 2011 22:26:18 +0000 (15:26 -0700)]
Merge "Fix stupid bug breaking touch on devices without a nav bar." into ics-mr0
Robert Ly [Mon, 17 Oct 2011 22:23:18 +0000 (15:23 -0700)]
Merge "docs: nfc updates"
Claudia de Veaux [Mon, 17 Oct 2011 21:05:36 +0000 (14:05 -0700)]
Merge "String edits to bring to standards. Bugs:
5165745,
5163232,
5162668,
5162667,
5162328"
Jamie Gennis [Mon, 17 Oct 2011 19:40:49 +0000 (12:40 -0700)]
am
c4de6f81: Merge "MediaPlayer: properly handle released surfaces" into ics-mr0
* commit '
c4de6f81d4533acbfc162d051de480d474b72e76':
MediaPlayer: properly handle released surfaces
Jamie Gennis [Mon, 17 Oct 2011 19:38:36 +0000 (12:38 -0700)]
Merge "MediaPlayer: properly handle released surfaces" into ics-mr0
The Android Open Source Project [Mon, 17 Oct 2011 19:20:06 +0000 (12:20 -0700)]
Reconcile with ics-mr0-release
Change-Id: Id91d1990671b3bb8778b0bac178a36e63f7c7b8a
Peter Ng [Mon, 17 Oct 2011 18:58:54 +0000 (11:58 -0700)]
am
63fae9d5: Merge "Layout changes to recents" into ics-mr0
* commit '
63fae9d56286e7c51261a5a00755466b350efa33':
Layout changes to recents
Peter Ng [Mon, 17 Oct 2011 18:57:38 +0000 (11:57 -0700)]
Merge "Layout changes to recents" into ics-mr0
Scott Main [Mon, 17 Oct 2011 18:35:54 +0000 (11:35 -0700)]
am
ca3c8a97: Merge "docs: revisions to api overview" into ics-mr0
* commit '
ca3c8a9703ccde66570f0130bb3a8863dd53e4b6':
docs: revisions to api overview
Jamie Gennis [Mon, 17 Oct 2011 18:35:53 +0000 (11:35 -0700)]
am
3a735078: Merge "SurfaceTexture: report binder transaction failures" into ics-mr0
* commit '
3a73507801b56da83140fad14a1a3d4eced213d9':
SurfaceTexture: report binder transaction failures
Dianne Hackborn [Mon, 17 Oct 2011 18:32:51 +0000 (11:32 -0700)]
am
c047f60d: Merge "Fix issue #
5445666: bunch of com.android.server.TextServicesManagerService crashes" into ics-mr0
* commit '
c047f60db277252f8921b88c82df1a8812afb169':
Fix issue #
5445666: bunch of com.android.server.TextServicesManagerService crashes
Daniel Sandler [Mon, 17 Oct 2011 18:32:47 +0000 (11:32 -0700)]
am
61e980d6: Merge "Turn off chatty logging." into ics-mr0
* commit '
61e980d6187aa052e92387d7b12b3179a9427db4':
Turn off chatty logging.
Chet Haase [Mon, 17 Oct 2011 18:32:45 +0000 (11:32 -0700)]
am
1aad3b5e: Merge "Issue
5432115: Speed up notification scrolling" into ics-mr0
* commit '
1aad3b5e336a04ed612c091d8002569f959e1722':
Issue
5432115: Speed up notification scrolling
OSDN Git Service
