OSDN Git Service
Daniel Sandler [Mon, 1 Oct 2012 20:45:10 +0000 (16:45 -0400)]
Support new ACTION_QUICK_CLOCK.
See change Ic561dbeb.
Bug:
7264806
Change-Id: I8439f2c25614ef794e43f85196d3f95c188e8cce
rich cannings [Sun, 30 Sep 2012 22:48:54 +0000 (15:48 -0700)]
Merge "Add Help lin to Settings > Security" into jb-mr1-dev
rich cannings [Sun, 30 Sep 2012 20:54:26 +0000 (13:54 -0700)]
Add Help lin to Settings > Security
Bug:
7210077
Change-Id: I1010356e27d85006e7d7dc62d935b67f53ccde12
Amith Yamasani [Sun, 30 Sep 2012 21:41:11 +0000 (14:41 -0700)]
Merge "Make Settings shortcuts launch into the correct activity/fragment." into jb-mr1-dev
Amith Yamasani [Fri, 28 Sep 2012 23:40:42 +0000 (16:40 -0700)]
Make Settings shortcuts launch into the correct activity/fragment.
Bug:
6959454
Change the task affinities so that the shortcuts are not tied to
Settings main task.
Change-Id: I7729d17d8144a4a57f0d135fe80bdbd7af8dad01
Dianne Hackborn [Sat, 29 Sep 2012 01:18:21 +0000 (18:18 -0700)]
Merge "Fix issue #
7255954: API Review: rename Dream to DreamService" into jb-mr1-dev
Dianne Hackborn [Sat, 29 Sep 2012 01:02:15 +0000 (18:02 -0700)]
Fix issue #
7255954: API Review: rename Dream to DreamService
Change-Id: Ic374130cb37cbbfad0421089aecf30de87c4d369
Robert Greenwalt [Fri, 28 Sep 2012 23:54:03 +0000 (16:54 -0700)]
Merge "Colorize premium sms ui." into jb-mr1-dev
Svetoslav Ganov [Thu, 27 Sep 2012 23:04:54 +0000 (16:04 -0700)]
Setting to enable the global gesture for turning on accessibility.
1. Adding a setting to enable the gesture to turn on accessibility.
This is a new screen with a toggle switch similarly as screen
magnification which will contain explanation of how to perform
the gesture.
bug:
6171929
Change-Id: I84dfa46a9b7b789d99923684e08e52cf7d236eb2
Russell Brenner [Thu, 27 Sep 2012 18:37:54 +0000 (11:37 -0700)]
Show warnings when skipping Wi-Fi connection
If user skips over Wi-Fi, warn about possible carrier data charges or
inability to receive updates, depending on whether or not phone
service is available.
Note to translators: Some strings are being moved here from setup
wizard. They're tagged with their msgid's so as not to trigger
retranslation.
Bug:
7211786
Change-Id: Idec7863377bd453d1808b26ee3da75f8310b32e0
Amith Yamasani [Fri, 28 Sep 2012 07:00:53 +0000 (00:00 -0700)]
Merge "Bring up new user setup dialog when tapping on new user" into jb-mr1-dev
Baligh Uddin [Fri, 28 Sep 2012 06:41:51 +0000 (23:41 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 28 Sep 2012 06:40:16 +0000 (23:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifc3aa0738b4f2beccdc05c1c225ff60308def5d4
Auto-generated-cl: translation import
rich cannings [Fri, 28 Sep 2012 06:11:50 +0000 (23:11 -0700)]
Merge "Developer setting to skip Package Verification" into jb-mr1-dev
Amith Yamasani [Fri, 28 Sep 2012 06:01:35 +0000 (23:01 -0700)]
Bring up new user setup dialog when tapping on new user
Bug:
7245796
Also fix a few strings that changed and other UI tweaks to conform
to spec document.
Change-Id: If4409459b20ec8c8ece69b6c23c8ab49b0ca0cac
Jeff Sharkey [Fri, 28 Sep 2012 02:31:09 +0000 (19:31 -0700)]
Merge "Follow more Secure settings to Global." into jb-mr1-dev
Wink Saville [Fri, 28 Sep 2012 01:14:45 +0000 (18:14 -0700)]
Merge "Fix an NPE in WifiSettings." into jb-mr1-dev
rich cannings [Tue, 25 Sep 2012 23:20:36 +0000 (16:20 -0700)]
Developer setting to skip Package Verification
Add a developer setting to skip package verification when installing over
USB/ADB/ADT, but still perform package verification on all other installs.
This change also fixes visibility issues. Namely, now all "Verify apps"
related settings will disappear when
Settings.Global.PACKAGE_VERIFIER_SETTING_VISIBLE is 0.
Bug:
7183252
Change-Id: I04cfc4f521d1ecb73df56b172cf29cbd84f53dad
Jeff Sharkey [Thu, 27 Sep 2012 05:08:16 +0000 (22:08 -0700)]
Follow more Secure settings to Global.
Bug:
7232014,
7231331,
7231198
Change-Id: Iea055cfa58edb253b55fe30bf294994ad338cfa4
Wink Saville [Thu, 27 Sep 2012 23:16:15 +0000 (16:16 -0700)]
Fix an NPE in WifiSettings.
Under stressful conditions, like the Monkey tests, getActivity() can
return null. We assume this occurs when the fragment has shut down but
asynchronous commands are returning results. This change adds appropriate
null checks but assumes during normal operation the checks are not needed.
Bug:
7152711
Change-Id: I7a3736ccead33738dab1a36e78ae1d8042db6e94
Amith Yamasani [Thu, 27 Sep 2012 23:06:48 +0000 (16:06 -0700)]
Merge "Rename "Owner info" to "User info" for secondary users" into jb-mr1-dev
Russell Brenner [Thu, 27 Sep 2012 22:14:26 +0000 (15:14 -0700)]
Merge "Move super call to top of onActivityCreated" into jb-mr1-dev
Amith Yamasani [Thu, 27 Sep 2012 21:50:13 +0000 (14:50 -0700)]
Rename "Owner info" to "User info" for secondary users
Bug:
7237781
Change-Id: I40207d6aa34bf3b7403f077fc7f3a945d739269d
Adam Cohen [Thu, 27 Sep 2012 20:14:17 +0000 (13:14 -0700)]
Merge "Addressing issue
7243210, can't set status widget properly" into jb-mr1-dev
Robert Greenwalt [Thu, 27 Sep 2012 20:10:44 +0000 (13:10 -0700)]
Merge "Precreate a data structure so it's never null." into jb-mr1-dev
Adam Cohen [Thu, 27 Sep 2012 20:04:00 +0000 (13:04 -0700)]
Addressing issue
7243210, can't set status widget properly
Change-Id: I863136bbef123f1c13d9e887840ca48ac7ccbf95
Robert Greenwalt [Thu, 27 Sep 2012 18:21:12 +0000 (11:21 -0700)]
Precreate a data structure so it's never null.
Fixes NPE that the fast-fingered monkey sometimes triggers.
bug:
7084178
Change-Id: Ibeb5e1ce678f59207de5dd321e06ae88ccc52216
Baligh Uddin [Thu, 27 Sep 2012 17:03:48 +0000 (10:03 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Amith Yamasani [Thu, 27 Sep 2012 05:01:18 +0000 (22:01 -0700)]
Merge "Show warning dialog in a multiuser system when adding a new account." into jb-mr1-dev
Jeff Sharkey [Thu, 27 Sep 2012 03:15:19 +0000 (20:15 -0700)]
Merge "Clean up Global settings stragglers." into jb-mr1-dev
Baligh Uddin [Thu, 27 Sep 2012 01:51:25 +0000 (18:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibdc7730e6559d27b4c9abd2e3cec90f2a0d97a76
Auto-generated-cl: translation import
Amith Yamasani [Thu, 27 Sep 2012 00:57:15 +0000 (17:57 -0700)]
Show warning dialog in a multiuser system when adding a new account.
Bug:
7207092
Change-Id: I95ac107dbc867490dd2e492291501fd3630d267c
Jeff Sharkey [Thu, 27 Sep 2012 00:11:43 +0000 (17:11 -0700)]
Clean up Global settings stragglers.
Bug:
7242121
Change-Id: Ibe62c70f88c946e46a0604a6999b5ca18ac18a1e
Jeff Brown [Wed, 26 Sep 2012 20:36:53 +0000 (13:36 -0700)]
Avoid using hardcoded strings.
Bug:
7204211
Change-Id: Ida5f93719aad472964386f3591518547ddf32f94
Chris Wren [Wed, 26 Sep 2012 20:18:01 +0000 (13:18 -0700)]
Merge "show the dream enable switch in all conditions." into jb-mr1-dev
Chris Wren [Wed, 26 Sep 2012 18:39:05 +0000 (14:39 -0400)]
show the dream enable switch in all conditions.
Bug:
7229905
Change-Id: I3fc3b2e8ce1e8bb08c72daed9c5d33ce5ff343c6
Amith Yamasani [Wed, 26 Sep 2012 18:47:32 +0000 (11:47 -0700)]
Merge "Show more security settings, and fix missing summary in widget selection." into jb-mr1-dev
John Spurlock [Wed, 26 Sep 2012 16:40:54 +0000 (12:40 -0400)]
Dream settings now looks for the settings activity in xml.
Uses the new api for obtaining dream metadata, no longer looks
for the settings activity using the old metadata key.
Bug:
7172816
Change-Id: I5f9f9ea2a59df6a55c2f17bca5cdbe206f89d780
John Spurlock [Wed, 26 Sep 2012 15:16:34 +0000 (11:16 -0400)]
Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal.
This is to avoid even a temporary build breakage. Using the new
xml file will be done in a followup commit.
Bug:
7172816
Change-Id: If6fedefbee38428eda5b39994c3ad8ff86c8fef9
Amith Yamasani [Wed, 26 Sep 2012 05:17:33 +0000 (22:17 -0700)]
Show more security settings, and fix missing summary in widget selection.
Bug:
7232809
Change-Id: Ib7a67b83f455592ba5e0e48420924671f8ed95e8
Baligh Uddin [Wed, 26 Sep 2012 04:12:29 +0000 (21:12 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Svetoslav Ganov [Wed, 26 Sep 2012 01:17:15 +0000 (18:17 -0700)]
Merge "Show long message for a new user only once." into jb-mr1-dev
Amith Yamasani [Wed, 26 Sep 2012 00:18:21 +0000 (17:18 -0700)]
Merge "You section title for current user details" into jb-mr1-dev
Jeff Brown [Wed, 26 Sep 2012 00:03:21 +0000 (17:03 -0700)]
Merge "Update references to migrated global settings." into jb-mr1-dev
Jeff Brown [Wed, 26 Sep 2012 00:03:16 +0000 (17:03 -0700)]
Merge "Move OVERLAY_DISPLAY_DEVICES to Global." into jb-mr1-dev
Jeff Brown [Tue, 25 Sep 2012 23:24:59 +0000 (16:24 -0700)]
Merge "Fix regression in Bluetooth settings." into jb-mr1-dev
Svetoslav Ganov [Tue, 25 Sep 2012 23:11:16 +0000 (16:11 -0700)]
Show long message for a new user only once.
1. We show a longer message only for the first added user. The
longer message will be shown until the user has been created,
which is until the creator pokes the OK button in the create
new user dialog.
bug:
7210780
Change-Id: Ifed4899048a8369f41f145af204a1e4e860f9b4c
Baligh Uddin [Tue, 25 Sep 2012 23:09:15 +0000 (16:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic76cd17011c6da46ba5298eb2d1f081f7dc6f633
Auto-generated-cl: translation import
Amith Yamasani [Tue, 25 Sep 2012 22:47:08 +0000 (15:47 -0700)]
You section title for current user details
Bug:
7232244
Change-Id: I04904f423f236b4dcfc2e1c61618eb88b80b593c
Jeff Brown [Tue, 25 Sep 2012 22:01:02 +0000 (15:01 -0700)]
Update references to migrated global settings.
Bug:
7231172
Change-Id: Ia4abbb6f897e93ebe38e6536fac7411b96eb2bb5
Jeff Brown [Tue, 25 Sep 2012 22:21:40 +0000 (15:21 -0700)]
Move OVERLAY_DISPLAY_DEVICES to Global.
Bug:
7127417
Change-Id: I9ed62e98754eba8a6107a5cac00f00f83904852d
Robert Greenwalt [Tue, 25 Sep 2012 18:37:26 +0000 (11:37 -0700)]
Colorize premium sms ui.
bug:
7205024
Change-Id: I1d32515d0822f5c96013708f26422d4700f7490b
Michael Jurka [Tue, 25 Sep 2012 00:30:17 +0000 (17:30 -0700)]
UI refinements to security screen widgets interface
Bug #
7158868
Change-Id: Ia5be3986323119ea78b9e486b4d2e6e81bf145e7
Jeff Brown [Tue, 25 Sep 2012 03:33:51 +0000 (20:33 -0700)]
Fix regression in Bluetooth settings.
Bug:
7207090
Change-Id: Ie14a1d36a61b571766d2025ed7d8079712727690
Chris Wren [Mon, 24 Sep 2012 21:37:23 +0000 (14:37 -0700)]
Merge "move remaining dock settings into sound settings fragment." into jb-mr1-dev
Adam Cohen [Mon, 24 Sep 2012 20:15:14 +0000 (13:15 -0700)]
Ensuring that keyguard widgets are bound with correct options
-> We need to bind the widget and indicate that it is a keyguard widget
Change-Id: I8e76b45b86aecc671669022c6f5fad071b62837d
Jeff Sharkey [Mon, 24 Sep 2012 20:08:56 +0000 (13:08 -0700)]
Merge "Hide lockdown VPN when IMS auth is required." into jb-mr1-dev
Chris Wren [Mon, 24 Sep 2012 18:23:46 +0000 (14:23 -0400)]
move remaining dock settings into sound settings fragment.
Bug:
7016769
Change-Id: I21a7bf6140f7470dbb9bebeda1ebcc3f17c481c6
Jeff Sharkey [Mon, 24 Sep 2012 19:56:29 +0000 (12:56 -0700)]
Hide lockdown VPN when IMS auth is required.
Bug:
7069782
Change-Id: I978d89894da17164a1e0122adb5acbfda3586fa1
Adam Cohen [Mon, 24 Sep 2012 18:49:23 +0000 (11:49 -0700)]
Merge "Addressing issue where power control widget disappears issue
7205586" into jb-mr1-dev
Amith Yamasani [Mon, 24 Sep 2012 01:47:19 +0000 (18:47 -0700)]
Merge "Show more settings and add restrictions/dialogs for secondary users" into jb-mr1-dev
Amith Yamasani [Sun, 23 Sep 2012 19:54:14 +0000 (12:54 -0700)]
Show more settings and add restrictions/dialogs for secondary users
Bug:
7213029 crash in About>Status
Bug:
7212495 hide System updates for second user
Bug:
7212230 nickname editor should select the text
Bug:
7160487 TTS settings
Bug:
7129411 Settings needs visibility changes for secondary users
Change-Id: Ia2d1229c08b392edfa6b671fce4a382410405b14
Jeff Sharkey [Mon, 24 Sep 2012 00:40:47 +0000 (17:40 -0700)]
Storage item to represent cached data.
When touched, offers to clear all cached data.
Bug:
7216370
Change-Id: I86afe66b819fb7deeba909bef507925fc5a590f3
Baligh Uddin [Sun, 23 Sep 2012 15:14:05 +0000 (08:14 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Sun, 23 Sep 2012 15:13:38 +0000 (08:13 -0700)]
Merge "Remove no longer used dream_settings.xml." into jb-mr1-dev
Baligh Uddin [Sat, 22 Sep 2012 21:20:39 +0000 (14:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie4f6419929f793550859314eb624135452f845f4
Auto-generated-cl: translation import
John Spurlock [Sat, 22 Sep 2012 14:38:43 +0000 (10:38 -0400)]
Remove no longer used dream_settings.xml.
Change-Id: I8355372f4dd2f99a92b4a708cf38276c5e7f41d4
Romain Guy [Sat, 22 Sep 2012 02:28:11 +0000 (19:28 -0700)]
Merge "Add new developer setting to visualize overdraw" into jb-mr1-dev
Romain Guy [Sat, 22 Sep 2012 02:23:20 +0000 (19:23 -0700)]
Add new developer setting to visualize overdraw
Change-Id: I16d6bb5a199233efebf5c3211dbe57dc9b6729c9
Adam Cohen [Sat, 22 Sep 2012 01:52:24 +0000 (18:52 -0700)]
Addressing issue where power control widget disappears issue
7205586
Change-Id: I6eea146d3819d3b35f1420e59d4ebdbc66041a9e
Svetoslav Ganov [Sat, 22 Sep 2012 00:41:31 +0000 (17:41 -0700)]
Merge "Accessibility multi-user support." into jb-mr1-dev
Svetoslav Ganov [Thu, 20 Sep 2012 22:04:55 +0000 (15:04 -0700)]
Accessibility multi-user support.
1. Accessibility settings are now shown for every user.
bug:
6967373
Change-Id: Ie31a6a573031bde1d769e43c4d5d88b7e4c8525d
Svetoslav Ganov [Sat, 22 Sep 2012 00:12:07 +0000 (17:12 -0700)]
Merge "Remove accessibility category from developer options." into jb-mr1-dev
Dianne Hackborn [Sat, 22 Sep 2012 00:05:22 +0000 (17:05 -0700)]
Merge "Fix issue
7198767,
7198366,
7189824." into jb-mr1-dev
Dianne Hackborn [Fri, 21 Sep 2012 23:40:21 +0000 (16:40 -0700)]
Fix issue
7198767,
7198366,
7189824.
Bug #
7198767: Crash on choosing App info from the Recent apps tab
Bug #
7198366: Settings UI should not show other Users' apps
Bug #
7189824: Settings crashes on trying to access Battery usage summary
Also fix running services to be able to show user bitmap when in
secondary users, crash in running services if a service is running
whose app is not installed for the current user.
Change-Id: Ief24810c9ddce1ec3f8641ce08af79e1bc18f221
Baligh Uddin [Fri, 21 Sep 2012 23:35:05 +0000 (16:35 -0700)]
Revert "Import translations. DO NOT MERGE"
Build Broken
This reverts commit
8172ea490f5880b1e2df2856364c3d37c28ed155
Change-Id: I091c3300ecce597bb0133f62bc621f29af85e5ba
Baligh Uddin [Fri, 21 Sep 2012 22:48:35 +0000 (15:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iae4b42c08cd2e16f700c844579fcb9b1664a2960
Auto-generated-cl: translation import
Michael Jurka [Fri, 21 Sep 2012 08:10:59 +0000 (01:10 -0700)]
Merge "Add support for changing status widget on security screen" into jb-mr1-dev
Michael Jurka [Fri, 21 Sep 2012 02:03:35 +0000 (19:03 -0700)]
Add support for changing status widget on security screen
Change-Id: I68a8ce2ce03888a8decbe017d67634c6965f0a1a
Amith Yamasani [Fri, 21 Sep 2012 06:09:21 +0000 (23:09 -0700)]
Merge "Exclude dying users when querying the list" into jb-mr1-dev
Amith Yamasani [Fri, 21 Sep 2012 05:44:48 +0000 (22:44 -0700)]
Exclude dying users when querying the list
Bug:
7194894
Use the new API in UserManager to query the list of users, excluding
the dying ones.
Change-Id: Ib09bb723209030da7e8aca53d402ef4c96c273a3
Svetoslav Ganov [Fri, 21 Sep 2012 02:15:29 +0000 (19:15 -0700)]
Remove accessibility category from developer options.
1. There is a temporary accessibility option in developer options with
one item for enabling automatic zoom out and panning. This is not a
developer option in general and should not be there.
bug:
7207305
Change-Id: Ib146ccb3704dd94d635cc668b71c007fbd8d29b3
Fabrice Di Meglio [Thu, 20 Sep 2012 23:52:59 +0000 (16:52 -0700)]
Merge "Fix bug #
7198585 Settings > Display > Dream completely broken in RTL" into jb-mr1-dev
Fabrice Di Meglio [Thu, 20 Sep 2012 22:30:49 +0000 (15:30 -0700)]
Fix bug #
7198585 Settings > Display > Dream completely broken in RTL
- use start/end instead of left/right
- use android:textDirection="locale" on the TextView for forcing the
correct position of the title text
Change-Id: I968798dcd4ac9307ffc3e48369990b73d3d1b4db
Russell Brenner [Thu, 20 Sep 2012 20:57:23 +0000 (13:57 -0700)]
Move super call to top of onActivityCreated
The historical reasons for not calling super.onActivityCreated early
on appear to be no longer relevant.
Bug:
6935999
Change-Id: I63aad8a4c70ce938ecb07541267cad44e3e18e13
Jeff Brown [Thu, 20 Sep 2012 03:46:07 +0000 (20:46 -0700)]
First draft of wifi display settings UI.
All of the functionality is in place but the UI is
not fully polished yet.
Bug:
7178216
Change-Id: Id76843bff05cc71e5c02a31bc97c7070d58fff10
Jeff Sharkey [Thu, 20 Sep 2012 01:58:06 +0000 (18:58 -0700)]
Merge "Update string to reflect removed users." into jb-mr1-dev
Brian Muramatsu [Wed, 19 Sep 2012 22:40:56 +0000 (15:40 -0700)]
Merge "Fix regulatory information dialog appearance" into jb-mr1-dev
Jeff Sharkey [Wed, 19 Sep 2012 21:42:38 +0000 (14:42 -0700)]
Update string to reflect removed users.
Bug:
7194784
Change-Id: Ied3b4376d0ad664c61a5d3388fe24bc96c6ee466
Jeff Sharkey [Wed, 19 Sep 2012 21:52:33 +0000 (14:52 -0700)]
Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev
Jeff Sharkey [Wed, 19 Sep 2012 20:13:45 +0000 (13:13 -0700)]
Migrate UI to supportsMultipleUsers().
Bug:
7194531
Change-Id: I601340362053cfd7394dea0fa69bd0523303070b
Brian Muramatsu [Wed, 19 Sep 2012 18:19:54 +0000 (11:19 -0700)]
Fix NPE in DeviceInfoSettings
Bug
7192187
Change-Id: I6d404e5228c7f66e37137a27ebd555a88dda2f74
Jeff Sharkey [Wed, 19 Sep 2012 18:15:45 +0000 (11:15 -0700)]
Load user photos through system_server.
Bug:
7194137
Change-Id: Ie36ca40c48fb06d55d120bfcf3db69aea9d83829
Jeff Sharkey [Tue, 18 Sep 2012 22:35:35 +0000 (15:35 -0700)]
Omit PPTP VPNs from lockdown list.
Bug:
7064069
Change-Id: Ie4261828ef2dc5af32db3b327ca7ec00451e65d9
Amith Yamasani [Wed, 19 Sep 2012 18:14:45 +0000 (11:14 -0700)]
Merge "Fix a crash in InstalledAppDetails" into jb-mr1-dev
Amith Yamasani [Wed, 19 Sep 2012 17:58:32 +0000 (10:58 -0700)]
Fix a crash in InstalledAppDetails
Initialize mPackageInfo in onCreate
Bug:
7194755
Change-Id: Ic82351591bd38c4c161bbb23c4033038d1d7fa85
Irfan Sheriff [Wed, 19 Sep 2012 05:03:13 +0000 (22:03 -0700)]
Merge "Fix strings" into jb-mr1-dev
Brian Muramatsu [Wed, 19 Sep 2012 01:39:29 +0000 (18:39 -0700)]
Fix regulatory information dialog appearance
Bug
7081675
Replace RegulatoryInfoFragment with a custom preference so that the info
shows up properly in a dialog. DialogFragments do not appear
as dialogs when instantiated from preference XML files.
Change-Id: Icbdf73bd5b1d14f28a01d7b9cb0f37d90340eb46
Irfan Sheriff [Wed, 19 Sep 2012 04:03:42 +0000 (21:03 -0700)]
Fix strings
Bug:
7182012
Bug:
7071211
Change-Id: I34aa508d5e4151ffdc538a3ab9ae1ddf3749b345
Andy Stadler [Tue, 18 Sep 2012 23:26:19 +0000 (16:26 -0700)]
Merge "Rename file to satisfy strict Java requirement" into jb-mr1-dev