OSDN Git Service
Dianne Hackborn [Fri, 12 Nov 2010 20:44:52 +0000 (12:44 -0800)]
Buttons in battery details now switch fragments.
These were launching a whole new settings activity.
Change-Id: I6876acf54d484119eec339c8597b5d9d843bae56
Amith Yamasani [Fri, 12 Nov 2010 16:51:01 +0000 (08:51 -0800)]
Fix VPN settings flow.
Bug:
3053019
Dianne Hackborn [Thu, 11 Nov 2010 07:34:52 +0000 (23:34 -0800)]
Start fragmentizing battery usage.
Change-Id: I0864f6738b37c3203e166bb8f7e61e8904d9980a
Daisuke Miyakawa [Fri, 12 Nov 2010 02:28:03 +0000 (18:28 -0800)]
Comment out hidden method call.
Bug:
3053354
Change-Id: I5fb5d6eb33e50209c85a95065ac3d0cefb983f6b
Daisuke Miyakawa [Fri, 12 Nov 2010 00:58:52 +0000 (16:58 -0800)]
Merge "Delay showSoftInput() call."
Daisuke Miyakawa [Fri, 12 Nov 2010 00:36:50 +0000 (16:36 -0800)]
Delay showSoftInput() call.
We need to wait onFocusView() call back for actually showing
software keyboard.
Bug:
3053354
Change-Id: Idd946e3b8a372ddbabb8b36600c77290f77a06e6
Eric Fischer [Thu, 11 Nov 2010 23:50:52 +0000 (15:50 -0800)]
am
71d43248: (-s ours) am
5c205262: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
71d43248b96c1485faabb527b23267e3ad653282':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 11 Nov 2010 23:45:50 +0000 (15:45 -0800)]
am
5c205262: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
5c205262460ecc5bcfb92ffb10185a573a4b7c90':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 11 Nov 2010 23:43:19 +0000 (15:43 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Daisuke Miyakawa [Thu, 11 Nov 2010 17:20:26 +0000 (09:20 -0800)]
Merge "Enable wifi on XL Wifi setup."
Daisuke Miyakawa [Thu, 11 Nov 2010 17:03:54 +0000 (09:03 -0800)]
Enable wifi on XL Wifi setup.
In I5b29917af73aac6a82e13ba846a9d5085f9bd523, we removed
relevant code but it was wrong. At least we need to enable
Wifi once when the Activity is created.
Bug:
3186944
Change-Id: I078cdf9b3d8952e6ce7bb3f9b27a4439e82da534
Brad Fitzpatrick [Thu, 11 Nov 2010 16:48:43 +0000 (08:48 -0800)]
Don't complain about /proc usage in Settings killing animations.
Change-Id: If6c2b5dc2244ac4b921e45daeb8e0052306e2c54
Daisuke Miyakawa [Thu, 11 Nov 2010 05:33:05 +0000 (21:33 -0800)]
Add more useful logs.
Bug:
3053354
Change-Id: I917bad7efb55e4155f47257672becbb57995ff7c
Daisuke Miyakawa [Thu, 11 Nov 2010 03:34:27 +0000 (19:34 -0800)]
Merge "Add log message for requstFocus()"
Daisuke Miyakawa [Thu, 11 Nov 2010 02:17:15 +0000 (18:17 -0800)]
Add log message for requstFocus()
Bug:
3053354
Change-Id: I0fa20b5036d46fb909e778672bc476aeaf57af76
Dianne Hackborn [Thu, 11 Nov 2010 02:11:18 +0000 (18:11 -0800)]
am
969773aa: am
83d2698f: Merge "Fix issue #
3177284: Account for wake lock power usage on Crespo" into gingerbread
* commit '
969773aa735807acefd1788610d31e82322196de':
Fix issue #
3177284: Account for wake lock power usage on Crespo
Dianne Hackborn [Thu, 11 Nov 2010 02:07:18 +0000 (18:07 -0800)]
am
83d2698f: Merge "Fix issue #
3177284: Account for wake lock power usage on Crespo" into gingerbread
* commit '
83d2698f4f271f568333532ddbae33f8e2e13052':
Fix issue #
3177284: Account for wake lock power usage on Crespo
Dianne Hackborn [Thu, 11 Nov 2010 01:58:58 +0000 (17:58 -0800)]
Merge "Fix issue #
3177284: Account for wake lock power usage on Crespo" into gingerbread
Daisuke Miyakawa [Thu, 11 Nov 2010 00:05:01 +0000 (16:05 -0800)]
Merge "Refactor WiFi code around XL setup"
Daisuke Miyakawa [Tue, 9 Nov 2010 01:40:23 +0000 (17:40 -0800)]
Refactor WiFi code around XL setup
Major:
- move SetupWizard-related codes to WifiSettingsForSetupWizardXL as
much as possible
- stop using Preference for configurinig wifi network. We use
WifiConfigUiForSetupWizardXL instead, which is base on a bare View.
Minor:
- change button handling code expecting better readability.
- hide Detail button.
- modify strings a bit.
- add logs
Bug:
3175016
Change-Id: I5b29917af73aac6a82e13ba846a9d5085f9bd523
Eric Fischer [Wed, 10 Nov 2010 01:42:54 +0000 (17:42 -0800)]
Import revised translations.
Change-Id: I8ff3fdad70919d2937c3a897b5698e45078d0227
Eric Fischer [Tue, 9 Nov 2010 20:19:25 +0000 (12:19 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Ic9978f86bf778e815896bbe858e07d953d53843b
Joe Onorato [Tue, 9 Nov 2010 20:04:24 +0000 (12:04 -0800)]
Tweak nosdcard vs. tablet strings
We can't have versions of the strings for both tablet and nosdcard. Reword it so that we only need
the sdcard or no sdcard versions.
Change-Id: I4f2582504fd8a5e12489b40947f7de9d20e0314f
Amith Yamasani [Tue, 9 Nov 2010 06:37:55 +0000 (22:37 -0800)]
Merge "Bug fixes, UI flow improvements."
Dianne Hackborn [Tue, 9 Nov 2010 03:05:00 +0000 (19:05 -0800)]
Fix issue #
3177284: Account for wake lock power usage on Crespo
Change-Id: I5988d28fd192cd7fdb85140172a92141eb389964
Joe Onorato [Tue, 9 Nov 2010 02:26:54 +0000 (18:26 -0800)]
Merge "Show the accounts on the factory reset screen."
Joe Onorato [Tue, 9 Nov 2010 02:25:51 +0000 (18:25 -0800)]
Show the accounts on the factory reset screen.
Bug:
2823530
Change-Id: Idbf46aa59f3c529a3a3ef2d7d4e607822b34f51d
Amith Yamasani [Mon, 8 Nov 2010 22:28:05 +0000 (14:28 -0800)]
Bug fixes, UI flow improvements.
Bug:
3173067 - Auto timezone checkbox out of sync with dependency
Bug:
3175116 - Crash when launching Manage Accounts screen
Move "Add Account" to a menu item from a button at the bottom.
Brad Fitzpatrick [Mon, 8 Nov 2010 21:28:47 +0000 (13:28 -0800)]
Merge "Don't stutter animations during Bluetooth broadcasts."
Brad Fitzpatrick [Wed, 3 Nov 2010 22:53:47 +0000 (15:53 -0700)]
Don't stutter animations during Bluetooth broadcasts.
Bug:
3163109
Change-Id: I89ba3da4ee1f0999f3c7113f2f5fdce6fdafebd7
Irfan Sheriff [Mon, 8 Nov 2010 20:24:57 +0000 (12:24 -0800)]
Merge "Add frequency band control in UI"
Daisuke Miyakawa [Mon, 8 Nov 2010 20:17:19 +0000 (12:17 -0800)]
Use custom preference.xml in XL.
A spacer are added on the left side of each preference, which isn't
needed in XL setup screen.
Change-Id: Ie3b8e04b492b4a4840ba1bbda4a413673734fbaa
Irfan Sheriff [Thu, 4 Nov 2010 20:45:32 +0000 (13:45 -0700)]
Add frequency band control in UI
Change-Id: I5a9fa46af358f363b2fe80a8ba7599d13dea5eb7
Ken Wakasa [Sun, 7 Nov 2010 03:29:52 +0000 (12:29 +0900)]
Fix the string for auto caps. bug:
2101692
Change-Id: If6241110957719c64287fc5c49e8db884fef52d4
Amith Yamasani [Fri, 5 Nov 2010 16:25:47 +0000 (16:25 +0000)]
Merge "Updated visual look for Shortcuts selection."
satok [Thu, 4 Nov 2010 11:57:38 +0000 (20:57 +0900)]
Change API for input method subtype's mode from resource id to String
Change-Id: Ibf053d1747337cce3829288c6a47782f4dee9522
Elliott Hughes [Thu, 4 Nov 2010 22:43:30 +0000 (15:43 -0700)]
Merge "Use InetAddress.isNumeric."
Elliott Hughes [Thu, 4 Nov 2010 22:26:22 +0000 (15:26 -0700)]
Use InetAddress.isNumeric.
Bug:
3073384
Change-Id: I22b03efd7fe267f8b20c06cfc15aa5f0db487ca8
Amith Yamasani [Wed, 3 Nov 2010 19:01:58 +0000 (12:01 -0700)]
Updated visual look for Shortcuts selection.
Dianne Hackborn [Thu, 4 Nov 2010 18:40:31 +0000 (11:40 -0700)]
Remove vibrate setting if there is no vibrator.
Change-Id: I37e6f34ef0fb67ec0e75b83a3572bd5efc6b8d0e
Amith Yamasani [Thu, 4 Nov 2010 19:58:48 +0000 (12:58 -0700)]
Merge "Create activity wrappers for settings launchable through intents or shortcuts."
Amith Yamasani [Thu, 4 Nov 2010 16:59:44 +0000 (09:59 -0700)]
Create activity wrappers for settings launchable through intents or shortcuts.
Meta data specifies the fragment class and top-level header that it belongs to.
Bug:
3127704
Daisuke Miyakawa [Thu, 4 Nov 2010 19:45:34 +0000 (12:45 -0700)]
Merge "Fix UI for WifiSettings for XL screen"
Daisuke Miyakawa [Thu, 4 Nov 2010 19:21:45 +0000 (12:21 -0700)]
Fix UI for WifiSettings for XL screen
Change-Id: I874e1e8d86e8b219414f6bf2ff945ea4f9ab7a6c
Nick Pelly [Thu, 4 Nov 2010 17:32:14 +0000 (10:32 -0700)]
am
b93b018a: am
91ba0709: Update settings text on success, so we clear out error text after recovery.
* commit '
b93b018ac646e8f8227477719652e1638e69cf4c':
Update settings text on success, so we clear out error text after recovery.
satok [Thu, 4 Nov 2010 06:09:52 +0000 (23:09 -0700)]
Merge "Reset selected InputMethodSubtype when the checkbox for the selected InputMethodSubtype was disabled"
Daisuke Miyakawa [Thu, 4 Nov 2010 03:04:32 +0000 (20:04 -0700)]
Show "connecting" just after user's connect action
Bug:
3164013
Change-Id: Ide367d51bcd7fcd97403c92ee049a1bb2633e272
Nick Pelly [Thu, 4 Nov 2010 02:59:47 +0000 (19:59 -0700)]
am
91ba0709: Update settings text on success, so we clear out error text after recovery.
* commit '
91ba0709b032d0c80ca086f53552f251a21c6df4':
Update settings text on success, so we clear out error text after recovery.
Nick Pelly [Thu, 4 Nov 2010 02:56:36 +0000 (21:56 -0500)]
Update settings text on success, so we clear out error text after recovery.
Change-Id: Ie6bff9f1b56d0218120cf98638b9cbfe505bd02d
Signed-off-by: Nick Pelly <npelly@google.com>
satok [Tue, 2 Nov 2010 19:11:56 +0000 (04:11 +0900)]
Reset selected InputMethodSubtype when the checkbox for the selected InputMethodSubtype was disabled
Change-Id: I04586cb4935b34d03af5e4dac54cfd000474af16
Jake Hamby [Wed, 3 Nov 2010 19:47:51 +0000 (12:47 -0700)]
Implement individual Bluetooth profile connect/disconnect.
Allow individual Bluetooth profiles to be connected/disconnected from
the device's settings pane.
Bug:
3137982
Change-Id: I21512c5bf965fc523f3dc1e83d029b16b5e22440
Amith Yamasani [Tue, 2 Nov 2010 16:52:29 +0000 (09:52 -0700)]
Fragmentize "Factory reset" setting screen.
Split the screen into 2 fragments.
Bug:
3148480
Eric Fischer [Mon, 1 Nov 2010 23:54:51 +0000 (16:54 -0700)]
Split strings referring to "phone" into phone and tablet variants.
Change-Id: If38152590580ff24da1c5593e1da53ac6b1952e2
Amith Yamasani [Tue, 2 Nov 2010 18:35:14 +0000 (11:35 -0700)]
Merge "Directly show edit dialog when a user dictionary word is selected."
Amith Yamasani [Sun, 31 Oct 2010 17:53:27 +0000 (10:53 -0700)]
Directly show edit dialog when a user dictionary word is selected.
Don't show the intermediate Edit/Delete options, since there is now
a direct way to delete an item.
Bug:
3148989
Change-Id: Iae39121ca8926c23bf0b10f4ef9a5dac210d2324
satok [Tue, 2 Nov 2010 07:12:10 +0000 (00:12 -0700)]
Merge "Save and update enabled Subtypes in InputMethodAndSubtypeEnabler"
satok [Mon, 1 Nov 2010 13:30:29 +0000 (22:30 +0900)]
Save and update enabled Subtypes in InputMethodAndSubtypeEnabler
Change-Id: I01ce22b7cc17457dde34967957a27658067ec674
Irfan Sheriff [Mon, 1 Nov 2010 21:23:25 +0000 (14:23 -0700)]
Remove channel control from debug builds
We dont need this in the UI now that
channel settings is gone. The country
code setting can be done from CLI
for debug purposes.
Bug:
2936741
Change-Id: Ic61abac30af99611af4d67662355068cea6dd4ed
Dianne Hackborn [Mon, 1 Nov 2010 19:32:33 +0000 (12:32 -0700)]
Further manage apps fragmentization.
All of the UI under manage apps should now be working. Various
cleanup through new framework APIs. Fragmentized developer settings.
Change-Id: I2b42a2dd0d015e0fdcde497579ddad3dceea9da2
satok [Mon, 1 Nov 2010 10:05:00 +0000 (19:05 +0900)]
Move classes related to input method to com.android.settings.inputmethod
- Updated proguard.flags
Change-Id: I198761b0f0ad5288c8c807a7a3c2e965731fcee5
satok [Mon, 1 Nov 2010 08:09:15 +0000 (17:09 +0900)]
Make InputMethodAndSubtypeUtil and share utilities by LanguageSettings and InputMethodAndSubtypeUtil
Change-Id: I70b9ce62a87a38054be0fce4234104aee9be9a87
Dianne Hackborn [Sat, 30 Oct 2010 01:24:24 +0000 (18:24 -0700)]
Merge "Start fragmentizing Manage Applications."
Daisuke Miyakawa [Sat, 30 Oct 2010 00:53:01 +0000 (17:53 -0700)]
Reduce default settings in WifiSetup XL.
We don't want to show every configurations in default, while
we also don't want to complicate basic wifi logics. In order to
achive both goals, we first introduce tweaked xml file
(wifi_config_preference2.xml). It does contain all the
config components but almost all of them are in "gone" visibility.
Those components are still able to act as data storage, but never
be seen as actual UI components.
Change-Id: I4ad3c1b4cbbe77ca2b628b0be25e2b3eb9d645aa
Dianne Hackborn [Fri, 29 Oct 2010 23:53:04 +0000 (16:53 -0700)]
Start fragmentizing Manage Applications.
Change-Id: I0c3d6a358d0236893aba7257537ec32bfad4170d
Daisuke Miyakawa [Fri, 29 Oct 2010 23:04:43 +0000 (16:04 -0700)]
Merge "Fix layout for WifiSettingsForXL"
Daisuke Miyakawa [Fri, 29 Oct 2010 23:03:23 +0000 (16:03 -0700)]
Fix layout for WifiSettingsForXL
Change-Id: I99b503005d199084062b63a2de1e049926b212a9
Dianne Hackborn [Fri, 29 Oct 2010 22:42:51 +0000 (15:42 -0700)]
am
5f301797: am
4e4ed14e: Fix issue #
3146784: ANR in manage applications
* commit '
5f3017975ac007c54b16cfa292a29832cb2c3c28':
Fix issue #
3146784: ANR in manage applications
Dianne Hackborn [Fri, 29 Oct 2010 22:40:36 +0000 (15:40 -0700)]
am
4e4ed14e: Fix issue #
3146784: ANR in manage applications
* commit '
4e4ed14ee2b82cb90a25b3027eb36f190ce2e1e7':
Fix issue #
3146784: ANR in manage applications
Dianne Hackborn [Fri, 29 Oct 2010 20:49:20 +0000 (13:49 -0700)]
Fix issue #
3146784: ANR in manage applications
See the big comment.
Change-Id: I36164a6fcba58fe2b0e2b3aa216780d0d0e5ed37
Amith Yamasani [Fri, 29 Oct 2010 17:27:26 +0000 (10:27 -0700)]
Remove extra labels from Volume settings.
Bug:
3013561
Amith Yamasani [Thu, 28 Oct 2010 16:50:32 +0000 (09:50 -0700)]
Fix proguard flags to retain FindNearby class.
Bug:
3140836
Amith Yamasani [Wed, 27 Oct 2010 23:27:15 +0000 (16:27 -0700)]
Merge "Bluetooth settings revamp"
Amith Yamasani [Tue, 26 Oct 2010 20:44:33 +0000 (13:44 -0700)]
Bluetooth settings revamp
Added a separate scanning screen.
UI changes to not require long-press options.
Needs TODOs to be filled by BT team.
Bug:
3038327
Eric Fischer [Wed, 27 Oct 2010 21:36:03 +0000 (14:36 -0700)]
Import revised translations.
Change-Id: I0d19c79e3e0ac76527671d181bb77e8944ec4a5f
satok [Tue, 26 Oct 2010 09:58:09 +0000 (18:58 +0900)]
Copy InputMethodSubtypeEnabler from the framework
- TODO: remove InputMethodSubtypeEnabler from the framework
Change-Id: I751f3c73197c855c7f186ff64465d88ed1e2b603
Daisuke Miyakawa [Wed, 27 Oct 2010 00:21:34 +0000 (17:21 -0700)]
Supress auto screen migration after wifi connection
Bug:
3133575
Change-Id: Ibf0a6cd8704d55cb5876c76a547a97664c4b82e4
Irfan Sheriff [Thu, 21 Oct 2010 23:45:15 +0000 (16:45 -0700)]
UI for wps pin from device
Bug:
3119043
Bug:
3112178
Change-Id: I573146ed0c834cb88d5f42c25fe0be3ed501a321
Jean-Baptiste Queru [Tue, 26 Oct 2010 00:59:56 +0000 (17:59 -0700)]
am
28539897: am
8815f032: Merge "Always set right auth_type value in apn."
Merge commit '
28539897151f0980b0a190ce82b3adf6337d081c'
* commit '
28539897151f0980b0a190ce82b3adf6337d081c':
Always set right auth_type value in apn.
Jean-Baptiste Queru [Tue, 26 Oct 2010 00:32:17 +0000 (17:32 -0700)]
am
8815f032: Merge "Always set right auth_type value in apn."
Merge commit '
8815f03202abf3117b6a1f6a058a835915ddae04' into gingerbread-plus-aosp
* commit '
8815f03202abf3117b6a1f6a058a835915ddae04':
Always set right auth_type value in apn.
Jean-Baptiste Queru [Mon, 25 Oct 2010 23:40:13 +0000 (16:40 -0700)]
Merge "Always set right auth_type value in apn."
Eric Fischer [Mon, 25 Oct 2010 23:22:34 +0000 (16:22 -0700)]
am
c26cfa35: (-s ours) am
873a27c3: Import revised translations. DO NOT MERGE
Merge commit '
c26cfa35b8e7d9e1ecc50f93825a05c08afed976'
* commit '
c26cfa35b8e7d9e1ecc50f93825a05c08afed976':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 25 Oct 2010 23:16:14 +0000 (16:16 -0700)]
am
873a27c3: Import revised translations. DO NOT MERGE
Merge commit '
873a27c399a50cb2a4703cc895c1601124ae208d' into gingerbread-plus-aosp
* commit '
873a27c399a50cb2a4703cc895c1601124ae208d':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 25 Oct 2010 22:46:11 +0000 (15:46 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I0cb51009ba4b9954dd673d7f653f0e0b8376ca72
Roy West [Mon, 25 Oct 2010 14:33:41 +0000 (07:33 -0700)]
Fix bug3100739 re dev admin settings strings
Change-Id: Ica5cc926fb8a3ec3af9d4925f086ded0ac683c3a
Marta Białka [Mon, 25 Oct 2010 13:39:04 +0000 (15:39 +0200)]
Always set right auth_type value in apn.
It fixes a bug that automatically sets auth_type value
of editing apn that has and should have that value set
to null (-1 = Not yet set) to auth_type value of an
apn previously displayed in the apn editor. It is
caused by careless persisting and reading data from
SharedPreferences. Fixed to keep and persist (to be
consistent with other apn's Preferences) null value
for not yet set auth_type property.
Change-Id: I4e125a4cdbad968c9f6ea8781a8c849f4c31c929
Daisuke Miyakawa [Sun, 24 Oct 2010 20:43:52 +0000 (13:43 -0700)]
Merge "Disable Wifi when a user press cancel in XL setup"
Eric Fischer [Fri, 22 Oct 2010 23:06:48 +0000 (16:06 -0700)]
am
0b655575: (-s ours) am
901f4fbe: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 22 Oct 2010 23:03:49 +0000 (16:03 -0700)]
am
901f4fbe: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 22 Oct 2010 23:01:29 +0000 (16:01 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 22 Oct 2010 22:31:13 +0000 (15:31 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I3edc02925b4d8bc149dd8a76056f86f3b5130e4e
Dianne Hackborn [Fri, 22 Oct 2010 20:01:02 +0000 (13:01 -0700)]
am
8731cb1b: am
5e34f239: Fix issue #
3124528: Mange applications is including cache files in storage size
Dianne Hackborn [Fri, 22 Oct 2010 19:59:31 +0000 (12:59 -0700)]
am
5e34f239: Fix issue #
3124528: Mange applications is including cache files in storage size
Dianne Hackborn [Fri, 22 Oct 2010 19:18:16 +0000 (12:18 -0700)]
Fix issue #
3124528: Mange applications is including cache files in storage size
Change-Id: If26aeaed7572354feca7b8e65b7451a024a10266
Jaikumar Ganesh [Tue, 19 Oct 2010 00:14:56 +0000 (17:14 -0700)]
Update BT APIs for change in return type.
Change-Id: Ic85b47da50876fd6bdc6e223af4248a8586d82bc
Mathew Inwood [Thu, 21 Oct 2010 17:43:35 +0000 (18:43 +0100)]
Add 'Use My Location for Google services'.
This interfaces to GSF to actually change the setting as Settings doesn't
have the permissions to do it directly. When GSF is not present on the device,
the setting will be hidden.
Depending on change: Ib3809571fe22f40ba34468d39fedfff70f0742ef
Bug:
3093036
Change-Id: I98596cce118f0fa5ebae45a7f8ab9c9f8a3bf2bc
Daisuke Miyakawa [Fri, 22 Oct 2010 02:40:16 +0000 (19:40 -0700)]
Disable Wifi when a user press cancel in XL setup
Bug:
3122182
Change-Id: Id333b9ede9093fa7fb8aa256b720effa5abf290d
Eric Fischer [Fri, 22 Oct 2010 01:31:02 +0000 (18:31 -0700)]
resolved conflicts for merge of
92acdba0 to master
Change-Id: I3598e15091fdb2593a2d9d56f6bf646ddc87e879
Eric Fischer [Fri, 22 Oct 2010 01:22:09 +0000 (18:22 -0700)]
am
a640fb4f: Fix the build. A "--" token is not just text in an XML comment.
Merge commit '
a640fb4f97ee5e317ed51bd585c892d465b3da38' into gingerbread-plus-aosp
* commit '
a640fb4f97ee5e317ed51bd585c892d465b3da38':
Fix the build. A "--" token is not just text in an XML comment.
Eric Fischer [Fri, 22 Oct 2010 01:15:34 +0000 (18:15 -0700)]
Fix the build. A "--" token is not just text in an XML comment.
Change-Id: Ifbc3de1dd209860f516920e5b9c1742813845380
Roy West [Fri, 22 Oct 2010 00:59:54 +0000 (17:59 -0700)]
am
d2927990: (-s ours) am
69827524: Try to fix bug3119318 without breaking the build this time
Merge commit '
d2927990ffe0d8ac385e16a38c189ace00065cff'
* commit '
d2927990ffe0d8ac385e16a38c189ace00065cff':
Try to fix bug3119318 without breaking the build this time