OSDN Git Service
Dave Burke [Thu, 20 Oct 2011 05:38:45 +0000 (22:38 -0700)]
am
23d64420: Merge "Stagefright: idle OMX after ANW errors" into ics-mr0
* commit '
23d644202a44383bf008ff86f6faa3ea7e447290':
Stagefright: idle OMX after ANW errors
Dave Burke [Thu, 20 Oct 2011 05:37:18 +0000 (22:37 -0700)]
Merge "Stagefright: idle OMX after ANW errors" into ics-mr0
Winson Chung [Thu, 20 Oct 2011 04:39:31 +0000 (21:39 -0700)]
am
44630c72: Merge "Updating the screenshot notification icons." into ics-mr0
* commit '
44630c72651803ba1dedba3b5352cad8a8a62ace':
Updating the screenshot notification icons.
Winson Chung [Thu, 20 Oct 2011 04:36:32 +0000 (21:36 -0700)]
Merge "Updating the screenshot notification icons." into ics-mr0
Svetoslav Ganov [Thu, 20 Oct 2011 04:17:14 +0000 (21:17 -0700)]
am
5dc30a77: Merge "DatePicker crashes when going from 2036 to 2035 via ▼" into ics-mr0
* commit '
5dc30a770ab1b4f07ff10502f9de9ec39daac41d':
DatePicker crashes when going from 2036 to 2035 via ▼
Svetoslav Ganov [Thu, 20 Oct 2011 04:15:30 +0000 (21:15 -0700)]
Merge "DatePicker crashes when going from 2036 to 2035 via ▼" into ics-mr0
Jim Miller [Thu, 20 Oct 2011 03:50:45 +0000 (20:50 -0700)]
am
2f35281a: Merge "Fix
5485925: Fix crash in transport control view" into ics-mr0
* commit '
2f35281ae0ae4471527e9286f022cb960384044e':
Fix
5485925: Fix crash in transport control view
Jim Miller [Thu, 20 Oct 2011 03:49:33 +0000 (20:49 -0700)]
Merge "Fix
5485925: Fix crash in transport control view" into ics-mr0
Chih-Chung Chang [Thu, 20 Oct 2011 03:09:13 +0000 (20:09 -0700)]
am
f806871f: Fix
5487571: Make sure shutter sound is played when it\'s enforced
* commit '
f806871f3016a8184de4c9dcfbe0b9069dc0d72c':
Fix
5487571: Make sure shutter sound is played when it's enforced
Maarten Hooft [Thu, 20 Oct 2011 01:23:20 +0000 (18:23 -0700)]
am
d47d4f7b: Merge "Add a delay before walled garden test" into ics-mr0
* commit '
d47d4f7b7713a4a05da7ea55c3e698b939fe81b1':
Add a delay before walled garden test
Maarten Hooft [Thu, 20 Oct 2011 01:21:56 +0000 (18:21 -0700)]
Merge "Add a delay before walled garden test" into ics-mr0
Svetoslav Ganov [Thu, 20 Oct 2011 01:18:44 +0000 (18:18 -0700)]
am
06044fe1: Merge "AccessibilityServiceInfo does not report properly the feedback type." into ics-mr0
* commit '
06044fe114f7f07c15b0ba92740829cb8896766b':
AccessibilityServiceInfo does not report properly the feedback type.
Svetoslav Ganov [Thu, 20 Oct 2011 01:15:52 +0000 (18:15 -0700)]
Merge "AccessibilityServiceInfo does not report properly the feedback type." into ics-mr0
Daniel Sandler [Thu, 20 Oct 2011 01:07:18 +0000 (18:07 -0700)]
am
84e825a8: Merge "Add hasNavigationBar() to the window manager." into ics-mr0
* commit '
84e825a84d7dde03042228c79638935c92d13c92':
Add hasNavigationBar() to the window manager.
Dirk Dougherty [Thu, 20 Oct 2011 01:07:16 +0000 (18:07 -0700)]
am
62ade220: Merge "Doc change: add video to platform highlights and fix a few things." into ics-mr0
* commit '
62ade220d9b72a9edc8fcc4dfe98ca9541c6d501':
Doc change: add video to platform highlights and fix a few things.
Daniel Sandler [Thu, 20 Oct 2011 01:05:20 +0000 (18:05 -0700)]
Merge "Add hasNavigationBar() to the window manager." into ics-mr0
Dirk Dougherty [Thu, 20 Oct 2011 01:05:18 +0000 (18:05 -0700)]
Merge "Doc change: add video to platform highlights and fix a few things." into ics-mr0
James Dong [Thu, 20 Oct 2011 00:57:58 +0000 (17:57 -0700)]
am
b3cdadb6: Merge "Check whether media recorder client exists before dumping." into ics-mr0
* commit '
b3cdadb639027f62c7c1637ca962a70d2d1f3b4d':
Check whether media recorder client exists before dumping.
James Dong [Thu, 20 Oct 2011 00:55:45 +0000 (17:55 -0700)]
Merge "Check whether media recorder client exists before dumping." into ics-mr0
Dianne Hackborn [Thu, 20 Oct 2011 00:17:29 +0000 (17:17 -0700)]
am
16362041: Merge "Fix issue #
5484096: Device rebooted after turning WiFi tethering ON, IRL19 Crespo." into ics-mr0
* commit '
163620417bc2980528e2079e3456c9600a92e165':
Fix issue #
5484096: Device rebooted after turning WiFi tethering ON, IRL19 Crespo.
Dianne Hackborn [Thu, 20 Oct 2011 00:15:39 +0000 (17:15 -0700)]
Merge "Fix issue #
5484096: Device rebooted after turning WiFi tethering ON, IRL19 Crespo." into ics-mr0
Romain Guy [Thu, 20 Oct 2011 00:07:25 +0000 (17:07 -0700)]
Merge "Correctly dump DrawPatch operations in display lists"
Peter Ng [Wed, 19 Oct 2011 23:55:54 +0000 (16:55 -0700)]
Merge "Fixing blurry textfields"
Wink Saville [Wed, 19 Oct 2011 23:27:32 +0000 (16:27 -0700)]
Merge "Non-default link should be cleaned up on telephony db change."
Svetoslav Ganov [Wed, 19 Oct 2011 22:53:28 +0000 (15:53 -0700)]
am
018cb119: Merge "AdapterView does not check for null adapter when initializing accessibility event." into ics-mr0
* commit '
018cb119bca7a3a08dd59843e1fec9a3027a8133':
AdapterView does not check for null adapter when initializing accessibility event.
Svetoslav Ganov [Wed, 19 Oct 2011 22:51:18 +0000 (15:51 -0700)]
Merge "AdapterView does not check for null adapter when initializing accessibility event." into ics-mr0
Wink Saville [Wed, 19 Oct 2011 22:43:38 +0000 (15:43 -0700)]
Merge "Do not always say OTASP_NOT_NEEDED for LTE."
Adam Cohen [Wed, 19 Oct 2011 22:31:49 +0000 (15:31 -0700)]
Merge "Manually merging screenshot notification string changes to "
Eric Laurent [Wed, 19 Oct 2011 21:02:10 +0000 (14:02 -0700)]
am
3c86134a: Merge "Fix issue 381905: BassBoostTest CTS tests fail..." into ics-mr0
* commit '
3c86134a50618605c86eb9f5f120dbf97826e3e1':
Fix issue 381905: BassBoostTest CTS tests fail...
Eric Laurent [Wed, 19 Oct 2011 20:59:55 +0000 (13:59 -0700)]
Merge "Fix issue 381905: BassBoostTest CTS tests fail..." into ics-mr0
Scott Main [Wed, 19 Oct 2011 19:25:12 +0000 (12:25 -0700)]
am
bdca5c62: cherrypick from hc-mr2 Change-Id: I20c238ae599db79e41eaa2ea82a1e5631d004967 plus a small tweak to remove "other" data from platform chart docs: dashboard update
* commit '
bdca5c6237558015910a14d38f78ba84973e8ed4':
cherrypick from hc-mr2 Change-Id: I20c238ae599db79e41eaa2ea82a1e5631d004967 plus a small tweak to remove "other" data from platform chart docs: dashboard update
Scott Main [Wed, 19 Oct 2011 19:04:13 +0000 (12:04 -0700)]
am
47bc0fea: docs: fix typo in platform notes issue
5481512
* commit '
47bc0feace5b842b3b8bf07b88e41ff658667bb3':
docs: fix typo in platform notes issue
5481512
Daniel Sandler [Wed, 19 Oct 2011 19:00:13 +0000 (12:00 -0700)]
am
2f6a5327: Merge "Auto-close if you swipe away the last notification." into ics-mr0
* commit '
2f6a53270f113a244f3b6ca91a1efef2c4a26fac':
Auto-close if you swipe away the last notification.
Daniel Sandler [Wed, 19 Oct 2011 18:58:27 +0000 (11:58 -0700)]
Merge "Auto-close if you swipe away the last notification." into ics-mr0
Dianne Hackborn [Wed, 19 Oct 2011 18:10:18 +0000 (11:10 -0700)]
am
47f8367a: Merge "Work on issue #
5465917: Wakelock *overflow* held for very long times" into ics-mr0
* commit '
47f8367ab79247501d5d204632a7797fa8a888e5':
Work on issue #
5465917: Wakelock *overflow* held for very long times
Jamie Gennis [Wed, 19 Oct 2011 18:08:11 +0000 (11:08 -0700)]
am
827d069a: Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0
* commit '
827d069afb297b6d96c995c03da9d4ee17e60679':
SurfaceTexture: free buffers when disconnect fails
Dianne Hackborn [Wed, 19 Oct 2011 18:07:34 +0000 (11:07 -0700)]
Merge "Work on issue #
5465917: Wakelock *overflow* held for very long times" into ics-mr0
Jamie Gennis [Wed, 19 Oct 2011 18:06:05 +0000 (11:06 -0700)]
Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0
Michael Jurka [Wed, 19 Oct 2011 17:31:47 +0000 (10:31 -0700)]
am
9a76afff: Merge "Make Recent Apps faster" into ics-mr0
* commit '
9a76afff4da4bd51685b0938439c4f4a0e19345f':
Make Recent Apps faster
Ben Komalo [Wed, 19 Oct 2011 17:31:42 +0000 (10:31 -0700)]
am
8408e516: Merge "Fix remote device wipe to not hang." into ics-mr0
* commit '
8408e5165a74ddee7d2d8698314cfda521fbfc76':
Fix remote device wipe to not hang.
Michael Jurka [Wed, 19 Oct 2011 17:04:19 +0000 (10:04 -0700)]
Merge "Make Recent Apps faster" into ics-mr0
Ben Komalo [Wed, 19 Oct 2011 16:32:50 +0000 (09:32 -0700)]
Merge "Fix remote device wipe to not hang." into ics-mr0
Marco Nelissen [Wed, 19 Oct 2011 14:50:24 +0000 (07:50 -0700)]
Merge "Refactor FileInserter in MediaScanner and adding unit tests for the newly added class."
The Android Open Source Project [Wed, 19 Oct 2011 14:23:01 +0000 (07:23 -0700)]
Reconcile with ics-mr0-release
Change-Id: Ie6705bfff564fe89f151753a034decc60f02b03b
The Android Automerger [Wed, 19 Oct 2011 13:28:30 +0000 (06:28 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Dave Burke [Wed, 19 Oct 2011 06:00:08 +0000 (23:00 -0700)]
am
70ac412b: Merge "Add a LayerScreenshot" into ics-mr0
* commit '
70ac412b2fe7be2507189a9fdfb30c43b36d56ac':
Add a LayerScreenshot
Dave Burke [Wed, 19 Oct 2011 05:58:09 +0000 (22:58 -0700)]
Merge "Add a LayerScreenshot" into ics-mr0
Dave Burke [Wed, 19 Oct 2011 05:34:51 +0000 (22:34 -0700)]
am
d7035c58: Merge "Fix a hang in SF caused by invalid transform matrix from the WM" into ics-mr0
* commit '
d7035c58b006b62084232c8db6c4f7c4002170cc':
Fix a hang in SF caused by invalid transform matrix from the WM
Dave Burke [Wed, 19 Oct 2011 05:33:40 +0000 (22:33 -0700)]
Merge "Fix a hang in SF caused by invalid transform matrix from the WM" into ics-mr0
James Dong [Wed, 19 Oct 2011 05:17:34 +0000 (22:17 -0700)]
am
5264f600: Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0
* commit '
5264f6003bbcb8ca70df034379154914260cc322':
Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format.
James Dong [Wed, 19 Oct 2011 05:16:08 +0000 (22:16 -0700)]
Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0
Mathias Agopian [Wed, 19 Oct 2011 03:24:23 +0000 (20:24 -0700)]
am
f7613743: Merge "Don\'t call hwc set() if there is nothing new to do" into ics-mr0
* commit '
f7613743f29f38cbbaf4ae09996c380845a17daf':
Don't call hwc set() if there is nothing new to do
Mathias Agopian [Wed, 19 Oct 2011 03:24:21 +0000 (20:24 -0700)]
am
23bf2505: Merge "Make sure set GL state properly" into ics-mr0
* commit '
23bf250522b7dff9acd14c5900b66b1df9c76745':
Make sure set GL state properly
Mathias Agopian [Wed, 19 Oct 2011 03:23:22 +0000 (20:23 -0700)]
Merge "Don't call hwc set() if there is nothing new to do" into ics-mr0
Mathias Agopian [Wed, 19 Oct 2011 03:23:15 +0000 (20:23 -0700)]
Merge "Make sure set GL state properly" into ics-mr0
Mathias Agopian [Thu, 13 Oct 2011 23:02:48 +0000 (16:02 -0700)]
Add a LayerScreenshot
A LayerScreenshot is a special type of layer that contains a screenshot of
the screen acquired when its created. It works just like LayerDim.
Make sure to call compositionComplete() after rendering into a FBO.
Bug:
5446982,
5467587,
5466259
Change-Id: I5d8a1b4c327f9973d950cd4f4c0bca7f62825cd4
Eric Laurent [Wed, 19 Oct 2011 02:31:12 +0000 (19:31 -0700)]
am
ecfdd7ff: Merge "Limit AudioFlinger log." into ics-mr0
* commit '
ecfdd7ff468bfc861e84fe18992e26b89cc63126':
Limit AudioFlinger log.
Eric Laurent [Wed, 19 Oct 2011 02:29:39 +0000 (19:29 -0700)]
Merge "Limit AudioFlinger log." into ics-mr0
Dirk Dougherty [Wed, 19 Oct 2011 01:04:33 +0000 (18:04 -0700)]
am
cd815fc5: Merge "Doc change: Add Android 4.0 Platform Highlights" into ics-mr0
* commit '
cd815fc55bf998578461a95daf8d8fe4a6522961':
Doc change: Add Android 4.0 Platform Highlights
Dirk Dougherty [Wed, 19 Oct 2011 01:02:35 +0000 (18:02 -0700)]
Merge "Doc change: Add Android 4.0 Platform Highlights" into ics-mr0
Romain Guy [Wed, 19 Oct 2011 00:57:22 +0000 (17:57 -0700)]
Merge "Notify a Bitmap is has changed when calling copyPixelFromBuffer"
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
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
Scott Main [Wed, 19 Oct 2011 00:49:32 +0000 (17:49 -0700)]
Merge "docs: fix platform highlights" into ics-mr0
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
Jason Sams [Wed, 19 Oct 2011 00:44:33 +0000 (17:44 -0700)]
Merge "Add mandelbrot to compute perf"
Mathias Agopian [Wed, 19 Oct 2011 00:36:28 +0000 (17:36 -0700)]
Don't call hwc set() if there is nothing new to do
there was situations where SF's main loop would run (as if there was
an invalidate), but the dirty region was empty (so no new buffers
were retired). In this case we return early and don't swap, which
would cause drawing artifacts.
Bug:
5476838
Change-Id: Id3b7bf4b7aabec7919c50d9278eb2165973a4c3d
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
Scott Main [Wed, 19 Oct 2011 00:34:23 +0000 (17:34 -0700)]
Merge "docs: update homepage for ICS announcement" into ics-mr0
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
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
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
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
Robert Ly [Wed, 19 Oct 2011 00:20:57 +0000 (17:20 -0700)]
Merge "docs: rs link fixes" 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
Jamie Gennis [Wed, 19 Oct 2011 00:14:33 +0000 (17:14 -0700)]
SurfaceTexture: free buffers when disconnect fails
This change makes SurfaceTextureClient free its references to all the
buffers even when the disconnect binder call to the SurfaceTexture
fails.
Bug:
5384823
Change-Id: Iad787fbae5fda4769546fd52276e4e4030c62be6
The Android Automerger [Tue, 18 Oct 2011 23:55:49 +0000 (16:55 -0700)]
merge in ics-mr0-release history after reset to 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
John Reck [Tue, 18 Oct 2011 23:37:03 +0000 (16:37 -0700)]
Merge "Find on page asset update" into ics-mr0
Eric Fischer [Tue, 18 Oct 2011 23:27:32 +0000 (16:27 -0700)]
Merge "Import revised translations."
Christopher Tate [Tue, 18 Oct 2011 23:19:37 +0000 (16:19 -0700)]
Merge "Fix full backup of shared storage"
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
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
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
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
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
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
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)
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)
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
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
Mathias Agopian [Tue, 18 Oct 2011 21:49:27 +0000 (14:49 -0700)]
Make sure set GL state properly
when taking a screenshot, in particular, we could end up
with stale GL state when drawing LayerDim which resulted
in incortect rendering.
Bug:
5467587
Change-Id: Id9fbed2843481d31063620f3662b364c7e3ac781
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
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
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
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
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