OSDN Git Service
Irfan Sheriff [Wed, 19 Sep 2012 05:03:13 +0000 (22:03 -0700)]
Merge "Fix strings" into jb-mr1-dev
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
Michael Jurka [Tue, 18 Sep 2012 23:11:29 +0000 (16:11 -0700)]
Merge "Fix bug: allow users to select "none" for lockscreen widget" into jb-mr1-dev
Michael Jurka [Tue, 18 Sep 2012 22:17:58 +0000 (15:17 -0700)]
Fix bug: allow users to select "none" for lockscreen widget
Change-Id: Ibd0449899ce7c340a6f838c56de58b70538400fc
Jeff Sharkey [Tue, 18 Sep 2012 22:15:31 +0000 (15:15 -0700)]
Merge "Always show auto-sync; user-specific storage." into jb-mr1-dev
Jeff Sharkey [Tue, 18 Sep 2012 22:03:47 +0000 (15:03 -0700)]
Always show auto-sync; user-specific storage.
Auto-sync is per-user, so show it to all users. Also create user-
specific path when showing misc storage items.
Bug:
7179485,
7177335
Change-Id: I9f6029e22d519a5516a0f1a76e6aa55db3c2832c
Brian Muramatsu [Tue, 18 Sep 2012 21:59:35 +0000 (14:59 -0700)]
Merge "Add optional regulatory info page" into jb-mr1-dev
Adam Cohen [Tue, 18 Sep 2012 21:47:08 +0000 (14:47 -0700)]
Merge "Tweaking mechanism for adding keyguard widgets" into jb-mr1-dev
Andy Stadler [Tue, 18 Sep 2012 21:43:42 +0000 (14:43 -0700)]
Rename file to satisfy strict Java requirement
There is no code change, the classname is OK, it was just the
filename that needed a tweak.
Original code was Change-Id: I381ed96f6b57f414bbaccd694f55d2b992e330a4
Change-Id: I14f2009cff186647a736b1183acf815713234dd5
Adam Cohen [Tue, 18 Sep 2012 20:26:29 +0000 (13:26 -0700)]
Tweaking mechanism for adding keyguard widgets
-> Fix for issue
7173877
-> Fix for issue
7173587
Change-Id: I266cafcf175c98e0c8a8401e11faa5dd2e2fa885
Dianne Hackborn [Tue, 18 Sep 2012 21:19:27 +0000 (14:19 -0700)]
Merge "Fix issue #
7050530: NPE in Settings : settings.applications.RunningServiceDetails..." into jb-mr1-dev
Dianne Hackborn [Tue, 18 Sep 2012 21:17:36 +0000 (14:17 -0700)]
Fix issue #
7050530: NPE in Settings : settings.applications.RunningServiceDetails...
...addDetailViews(RunningServiceDetails.java:439)
Change-Id: Id4a110bacf4da1bec07272b3b75e8bf0986cab92
Michael Jurka [Tue, 18 Sep 2012 20:25:57 +0000 (13:25 -0700)]
Merge "Fix cases where app widget ids were not being cleaned up" into jb-mr1-dev
Dianne Hackborn [Tue, 18 Sep 2012 19:07:19 +0000 (12:07 -0700)]
Merge "Fix issue #
7178865: Selecting an app from Settings > Apps>..." into jb-mr1-dev
Dianne Hackborn [Tue, 18 Sep 2012 19:04:00 +0000 (12:04 -0700)]
Fix issue #
7178865: Selecting an app from Settings > Apps>...
...all crashes on a secondary user
Change-Id: I977932bce3ea2816e4c9d1002488b658a96e3986
Brian Muramatsu [Tue, 18 Sep 2012 06:09:35 +0000 (23:09 -0700)]
Add optional regulatory info page
Bug
7081675
If R.bools.config_show_regulatory_info is true, then show a "Regulatory
information" item on the "About phone" page. Show a DialogFragment
displaying the regulatory_info drawable if the item is clicked. Add a
1x1 blank regulatory_info drawable for devices that won't show this.
Change-Id: I5823d8969de038becf4911dce893dab5dbb23537
Amith Yamasani [Tue, 18 Sep 2012 16:55:20 +0000 (09:55 -0700)]
Merge "Add help menu for Users and Location access" into jb-mr1-dev
Amith Yamasani [Tue, 18 Sep 2012 16:51:07 +0000 (09:51 -0700)]
Add help menu for Users and Location access
Bug:
7093415
Bug:
7130812
Change-Id: I44c68e846dcc5d98fc8b152f79d75140e151323a
Baligh Uddin [Tue, 18 Sep 2012 14:24:52 +0000 (07:24 -0700)]
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
Baligh Uddin [Tue, 18 Sep 2012 14:24:16 +0000 (07:24 -0700)]
Revert "Import translations. DO NOT MERGE"
Broke the build.
This reverts commit
b4b2857236e09cbca0faeba07a879e49ad5a9bb4
Change-Id: I51f5f569d717bf0973e5e5a868e9fdc53ca80f99
Baligh Uddin [Tue, 18 Sep 2012 14:03:36 +0000 (07:03 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Amith Yamasani [Tue, 18 Sep 2012 05:53:37 +0000 (22:53 -0700)]
Merge "Use Bitmap instead of ParcelFileDescriptor to get the user's icon." into jb-mr1-dev
Amith Yamasani [Tue, 18 Sep 2012 01:31:45 +0000 (18:31 -0700)]
Use Bitmap instead of ParcelFileDescriptor to get the user's icon.
Change-Id: I1dd7261b47ba98a2a0834dbfb8c22de369e6cc58
Jim Miller [Tue, 18 Sep 2012 05:30:06 +0000 (22:30 -0700)]
Merge "Add flag to allow testing launcher widgets in keyguard." into jb-mr1-dev
Jim Miller [Tue, 18 Sep 2012 04:02:25 +0000 (21:02 -0700)]
Add flag to allow testing launcher widgets in keyguard.
Change-Id: I10fc3f6557dba9261b898d7b123d1391c1afdf06
Amith Yamasani [Tue, 18 Sep 2012 01:34:33 +0000 (18:34 -0700)]
Merge "Use UserManager.getUserIcon() to get the user's avatar." into jb-mr1-dev
Michael Jurka [Tue, 18 Sep 2012 00:46:49 +0000 (17:46 -0700)]
Fix cases where app widget ids were not being cleaned up
Change-Id: Ie3f1ba0cc0fe459ae9fff2665c2ff4aa76e95994
Baligh Uddin [Mon, 17 Sep 2012 22:27:01 +0000 (15:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4bbb7366b1791f33b685903e419dfee6ffcbc2f8
Auto-generated-cl: translation import
Amith Yamasani [Mon, 17 Sep 2012 17:21:27 +0000 (10:21 -0700)]
Use UserManager.getUserIcon() to get the user's avatar.
Change-Id: I035a5e2a518eb827a2e44910471ed04923921aa3
Baligh Uddin [Mon, 17 Sep 2012 17:21:20 +0000 (10:21 -0700)]
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
Baligh Uddin [Mon, 17 Sep 2012 17:18:44 +0000 (10:18 -0700)]
Revert "Import translations. DO NOT MERGE"
Build Broken.
This reverts commit
4a44ed7bd7a692780e855eb44d7dd86d0bbf78e5
Change-Id: Ie61c8d7b1e5eb46fe8aed1836f8d63f989d23db4
Baligh Uddin [Mon, 17 Sep 2012 17:00:38 +0000 (10:00 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Robert Greenwalt [Mon, 17 Sep 2012 15:14:07 +0000 (08:14 -0700)]
Merge "Must initialize the new atomic.." into jb-mr1-dev
Amith Yamasani [Mon, 17 Sep 2012 06:26:48 +0000 (23:26 -0700)]
Merge "More user management ui work" into jb-mr1-dev
Amith Yamasani [Mon, 17 Sep 2012 00:53:35 +0000 (17:53 -0700)]
More user management ui work
Show setup dialog after adding user.
Write user profile to nickname on setup.
Remove self.
Correct dialog text for user creation.
Bug:
7104261
Bug:
7174751
Bug:
7174685
Change-Id: I0ecd688f3edaef61332f974012454ceb87762e9f
Dianne Hackborn [Mon, 17 Sep 2012 01:27:14 +0000 (18:27 -0700)]
Add app details menu item to uninstall an app for all users.
Also some fixes: uninstalled apps are now marked as such in the
all apps lists, and sorted to the bottom like disabled apps. We
don't immediately close the installed app details screen when
launching the uninstall UI.
Change-Id: Id22b749c20fc2441733c604d1de8889269217c5c
Robert Greenwalt [Mon, 17 Sep 2012 00:03:08 +0000 (17:03 -0700)]
Must initialize the new atomic..
bug:
7172859
Change-Id: Ibaf390683fa36771215b463fb6b088f7430c0462
rich cannings [Sun, 16 Sep 2012 22:50:08 +0000 (15:50 -0700)]
Merge "Ability to hide verification settings" into jb-mr1-dev
John Huang [Sun, 16 Sep 2012 21:31:18 +0000 (14:31 -0700)]
Merge "Add support for per-package policy for sending premium SMS." into jb-mr1-dev
Svetoslav Ganov [Sun, 16 Sep 2012 21:20:36 +0000 (14:20 -0700)]
Merge "Updating the screen magnification description." into jb-mr1-dev
Kenny Root [Sun, 16 Sep 2012 21:01:43 +0000 (14:01 -0700)]
Do not allow non-primary user to install certs
Change-Id: Iefc2970ae23d8ce7d30717add211c01cde251c8d
rich cannings [Sun, 16 Sep 2012 20:58:07 +0000 (13:58 -0700)]
Ability to hide verification settings
Add a setting that controls the visibility of the package verification
setting in the Settings app.
Bug:
7022814
Change-Id: I6e503924adc112b4528d94b1e533baae6079e85e
Jeff Sharkey [Fri, 14 Sep 2012 23:26:51 +0000 (16:26 -0700)]
Data usage multi-user support.
Switch to storing policy per-user instead of per-app, meaning each
user has control over their own set of apps. Summarize the usage of
non-current users. Only allow owner to make changes to overall
network policy.
Hide auto-sync menu when viewing app details. Search for
MANAGE_NETWORK_USAGE intent across all package names sharing a UID.
Bug:
7121279,
5419594,
6978663
Change-Id: Ia70f04df70d27da27faccb947cd27021c628a41a
Svetoslav Ganov [Sat, 15 Sep 2012 02:41:05 +0000 (19:41 -0700)]
Updating the screen magnification description.
bug:
7054266
Change-Id: I59466d1e5c70a884badcfd0fdb01ffa3b920b7b7
Jake Hamby [Fri, 7 Sep 2012 00:41:34 +0000 (17:41 -0700)]
Add support for per-package policy for sending premium SMS.
The default behavior for sending a message to a premium SMS
short code (or suspected premium SMS number) is to ask the user for
confirmation. Enable the user to set a default policy ("remember this
choice" checkbox) to always/never allow the app to send SMS to
premium short codes in the future. The policy can be changed by
the Settings app in the app info screen.
Bug:
5513975
Change-Id: I93053fef1524ee7772cc87364c760cb3dbf01ad7
rich cannings [Fri, 14 Sep 2012 21:35:18 +0000 (14:35 -0700)]
Correct strings for Plaform Anti-malware
Set strings to:
Verify apps
Disallow or warn before installation of apps that may cause harm
Bug:
7168682
Change-Id: Ic0102dd82ec26dd7239eaeaa7daa2b2f47fd6365
Michael Jurka [Fri, 14 Sep 2012 21:12:14 +0000 (14:12 -0700)]
Merge "Fix crash in Settings > Security" into jb-mr1-dev
Michael Jurka [Fri, 14 Sep 2012 21:09:16 +0000 (14:09 -0700)]
Fix crash in Settings > Security
Change-Id: Ib439c652f4f8a55cac710dbd22792943a7ef8f98
Baligh Uddin [Fri, 14 Sep 2012 20:50:27 +0000 (13:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I07c9987422c8e957459b8425f49d1e1fbd25190c
Auto-generated-cl: translation import
Amith Yamasani [Fri, 14 Sep 2012 20:07:11 +0000 (13:07 -0700)]
Merge "Watch for profile changes and push to user manager" into jb-mr1-dev
Jeff Sharkey [Fri, 14 Sep 2012 20:03:27 +0000 (13:03 -0700)]
Merge "Treat cache storage usage as available space." into jb-mr1-dev
Jeff Sharkey [Fri, 14 Sep 2012 20:01:17 +0000 (13:01 -0700)]
Treat cache storage usage as available space.
Bug:
7123160
Change-Id: I1b3f36622be557d7c47f1452832f67da40893a02
Michael Jurka [Fri, 7 Sep 2012 16:24:03 +0000 (09:24 -0700)]
Add support for setting lock widgets
Change-Id: I26165f1bc60e3cf277dbdd4f627ac720b492ffde
Michael Jurka [Fri, 14 Sep 2012 19:19:39 +0000 (12:19 -0700)]
Merge "Adding ability to filter for certain types of widgets in picker activity" into jb-mr1-dev
Robert Greenwalt [Fri, 14 Sep 2012 17:53:54 +0000 (10:53 -0700)]
Merge "Protect self from async change of BluetoothPan" into jb-mr1-dev
Robert Greenwalt [Thu, 13 Sep 2012 22:02:00 +0000 (15:02 -0700)]
Protect self from async change of BluetoothPan
bug:
6945678
Change-Id: I627a55aea9170f889823a38c8e2bb08a06faa841
Amith Yamasani [Fri, 14 Sep 2012 01:06:49 +0000 (18:06 -0700)]
Watch for profile changes and push to user manager
If the contacts Me Profile changes, push a copy of the photo to
user manager for user by the user switcher.
Also use an async task to load the profile data.
Change-Id: Ie784114622038ff14e3feb70f2ff51c372eecb3f
Dianne Hackborn [Thu, 13 Sep 2012 17:36:13 +0000 (10:36 -0700)]
Merge "Multi-user battery settings." into jb-mr1-dev
Jeff Sharkey [Thu, 13 Sep 2012 08:31:46 +0000 (01:31 -0700)]
Merge "Iteration on multi-user Storage UI." into jb-mr1-dev
Jeff Sharkey [Thu, 13 Sep 2012 01:41:25 +0000 (18:41 -0700)]
Iteration on multi-user Storage UI.
Now that DefaultContainerService has visibility of external storage
for all users, we can measure internal storage in a single pass.
Internal storage measurement now iterates across all known users,
counting both apps and emulated storage usage.
Create MeasurementDetails object with documentation about what is
counted under various device configurations. Generalize to measure
each Environment.DIRECTORY separately, so it can be combined as
needed. General cleanup of how measurements are passed to UI.
Bug:
7003520
Change-Id: Ib89c185296a0c9debdc20beeaa98584d803a84e8
Dianne Hackborn [Thu, 13 Sep 2012 00:02:23 +0000 (17:02 -0700)]
Multi-user battery settings.
Aggregates battery use from other users into one line item.
Change-Id: I811e681891a9ff098491de1e096232f38bf061a9
Christopher Tate [Wed, 12 Sep 2012 22:41:41 +0000 (15:41 -0700)]
Merge "Don't crash during setup of secondary users" into jb-mr1-dev
Amith Yamasani [Wed, 12 Sep 2012 00:04:10 +0000 (17:04 -0700)]
Tell contacts to return back to Settings when done editing the profile info
Change-Id: I643884af6c062788123b59a115ce6e398430e6b1
Christopher Tate [Wed, 12 Sep 2012 21:30:35 +0000 (14:30 -0700)]
Merge "Correct settings namespace for auto time/tz" into jb-mr1-dev
Christopher Tate [Wed, 12 Sep 2012 21:27:43 +0000 (14:27 -0700)]
Don't crash during setup of secondary users
Make sure to call super.onActivityCreated() even in the short-circuit
case where there's an early 'return'. This has probably been broken
for a long time but was never exercised while bringing up a new-from-
scratch device, but is the usual code path now for secondary users.
Change-Id: I0c1a5116440908d65750133689507917307e1dcd
Christopher Tate [Wed, 12 Sep 2012 21:25:46 +0000 (14:25 -0700)]
Correct settings namespace for auto time/tz
Bug
7148283
Change-Id: If585b16f5b6ea3046e64eb9c8355fa3c9fbeeada
Fabrice Di Meglio [Wed, 12 Sep 2012 20:26:22 +0000 (13:26 -0700)]
Merge "Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev
Jeff Sharkey [Tue, 11 Sep 2012 22:45:19 +0000 (15:45 -0700)]
Include user identifier in external storage paths.
When building external storage paths, always include user in path
to enable cross-user paths and aid debugging.
Mostly changes so Storage doesn't crash; will take another UI
iteration pass soon.
Bug:
7131382
Change-Id: If7ec807f12a36eb8ed02a0fb94e8a0b3a6694f16
Adam Cohen [Wed, 12 Sep 2012 01:41:01 +0000 (18:41 -0700)]
Adding ability to filter for certain types of widgets in picker activity
Change-Id: I92d8748b62ef017b6cd36ff377958c09c9f097c9
Fabrice Di Meglio [Wed, 12 Sep 2012 01:01:38 +0000 (18:01 -0700)]
Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
- fix Data Usage text direction for list items
Change-Id: I938fa77e7cfb2a900daa9f5d081c8e2fd63a42cf
Fabrice Di Meglio [Wed, 12 Sep 2012 00:13:53 +0000 (17:13 -0700)]
Merge "Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev
Fabrice Di Meglio [Tue, 11 Sep 2012 22:17:40 +0000 (15:17 -0700)]
Fix bug #
7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
- fix "Network SSID" string direction
Change-Id: I8491f8f9d52f80863ee78b645e2e34f5f5ff3656
Christopher Tate [Tue, 11 Sep 2012 21:59:59 +0000 (14:59 -0700)]
Merge "Wifi settings are in a different namespace now" into jb-mr1-dev
Christopher Tate [Tue, 11 Sep 2012 21:53:25 +0000 (14:53 -0700)]
Wifi settings are in a different namespace now
Bug
7144874
Change-Id: I9d004f7e9d33c821fb64cf789036b6b4e0a23a8e
Martijn Coenen [Tue, 11 Sep 2012 21:43:57 +0000 (14:43 -0700)]
Merge "Fix on/off switch for Android Beam." into jb-mr1-dev
Martijn Coenen [Tue, 11 Sep 2012 21:32:30 +0000 (14:32 -0700)]
Fix on/off switch for Android Beam.
Bug:
7121720
Change-Id: Iec0f9ccfd439d11cfcc13afb45974ce1fd8778f0
Amith Yamasani [Tue, 11 Sep 2012 18:01:35 +0000 (11:01 -0700)]
Check the user limit before showing an ADD menu item
Change-Id: I0c5cffa149bfbf6824273b7180db55e1fe313021
Elliott Hughes [Tue, 11 Sep 2012 02:08:34 +0000 (19:08 -0700)]
am
ebca7f3e: am
6aeed784: am
f587f5a5: am
78f5c4d5: am
76ddf411: Merge "Fix /proc/version parsing in Settings."
* commit '
ebca7f3e8e54391e33a5fa656cb96a0dfb2d3732':
Fix /proc/version parsing in Settings.
Elliott Hughes [Tue, 11 Sep 2012 02:07:16 +0000 (19:07 -0700)]
am
6aeed784: am
f587f5a5: am
78f5c4d5: am
76ddf411: Merge "Fix /proc/version parsing in Settings."
* commit '
6aeed7846c5f428c56268d92b437679d683fed4a':
Fix /proc/version parsing in Settings.
Elliott Hughes [Tue, 11 Sep 2012 02:05:37 +0000 (19:05 -0700)]
am
f587f5a5: am
78f5c4d5: am
76ddf411: Merge "Fix /proc/version parsing in Settings."
* commit '
f587f5a54d4717c8f147ce46979f65f9301cd81d':
Fix /proc/version parsing in Settings.
Elliott Hughes [Tue, 11 Sep 2012 02:03:46 +0000 (19:03 -0700)]
am
78f5c4d5: am
76ddf411: Merge "Fix /proc/version parsing in Settings."
* commit '
78f5c4d5372e38b5a5d1e2f3e3b732951a76f007':
Fix /proc/version parsing in Settings.
Elliott Hughes [Tue, 11 Sep 2012 02:02:47 +0000 (19:02 -0700)]
am
76ddf411: Merge "Fix /proc/version parsing in Settings."
* commit '
76ddf4113ab73acfd3d6172a8965bffec2e7c60f':
Fix /proc/version parsing in Settings.
Michael Jurka [Tue, 11 Sep 2012 01:27:29 +0000 (18:27 -0700)]
am
43a5c62c: am
a47a3c8d: Merge "Fix color of text in widget picker" into jb-mr1-dev
* commit '
43a5c62ceb856dbc4ace1f85dfed276216217c8b':
Fix color of text in widget picker
Michael Jurka [Tue, 11 Sep 2012 01:24:46 +0000 (18:24 -0700)]
am
a47a3c8d: Merge "Fix color of text in widget picker" into jb-mr1-dev
* commit '
a47a3c8dea5212f95167b48be9a5f2af3d819c3a':
Fix color of text in widget picker
Amith Yamasani [Tue, 11 Sep 2012 01:23:05 +0000 (18:23 -0700)]
am
4e201cc6: am
f7d76210: Merge "User management UI: take 2" into jb-mr1-dev
* commit '
4e201cc6eae8a03e7a8133f32eec9ef0ff4dd7d0':
User management UI: take 2
Michael Jurka [Tue, 11 Sep 2012 01:22:10 +0000 (18:22 -0700)]
Merge "Fix color of text in widget picker" into jb-mr1-dev
Amith Yamasani [Tue, 11 Sep 2012 01:20:23 +0000 (18:20 -0700)]
am
f7d76210: Merge "User management UI: take 2" into jb-mr1-dev
* commit '
f7d7621022e97b516ce9d3a9c72de1780d43e556':
User management UI: take 2
Amith Yamasani [Tue, 11 Sep 2012 01:18:06 +0000 (18:18 -0700)]
Merge "User management UI: take 2" into jb-mr1-dev
Amith Yamasani [Fri, 7 Sep 2012 01:04:06 +0000 (18:04 -0700)]
User management UI: take 2
Single screen user management, also visible on secondary users.
Work in progress, especially with respect to synchronizing with
the Me profile.
Change-Id: Id6e94a85d53356847e4e019c52e3388de9ecb354
Michael Jurka [Tue, 11 Sep 2012 01:13:19 +0000 (18:13 -0700)]
Fix color of text in widget picker
Elliott Hughes [Tue, 11 Sep 2012 01:02:38 +0000 (18:02 -0700)]
Merge "Fix /proc/version parsing in Settings."
Elliott Hughes [Thu, 6 Sep 2012 21:12:31 +0000 (14:12 -0700)]
Fix /proc/version parsing in Settings.
Change-Id: I4bde0e4935eaa4c27067062443a051976daa115d
Christopher Tate [Tue, 11 Sep 2012 00:25:15 +0000 (17:25 -0700)]
am
3c76c467: am
6a5929b0: Update Settings app to use new namespace for airplane-mode settings
* commit '
3c76c467632194bc8bd4b8b69273ca4b5edf312d':
Update Settings app to use new namespace for airplane-mode settings
Christopher Tate [Tue, 11 Sep 2012 00:18:33 +0000 (17:18 -0700)]
am
6a5929b0: Update Settings app to use new namespace for airplane-mode settings
* commit '
6a5929b086a61a955a4a2f43f5fa251e8754ff4a':
Update Settings app to use new namespace for airplane-mode settings
Baligh Uddin [Tue, 11 Sep 2012 00:16:02 +0000 (17:16 -0700)]
am
8f113624: (-s ours) am
955f3477: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '
8f1136241df1544df54e653b007ca96da98ebae6':
Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 11 Sep 2012 00:15:46 +0000 (17:15 -0700)]
am
dd3f01af: (-s ours) am
6ac5ace7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
dd3f01afc3836b9955273f75a5d5fb63798be77f':
Import translations. DO NOT MERGE
John Spurlock [Tue, 11 Sep 2012 00:15:36 +0000 (17:15 -0700)]
am
e42e895d: am
f217f18d: Merge "Dream Settings: Disable settings icon if not selected." into jb-mr1-dev
* commit '
e42e895d9cedc83b5a2c4a86e20e6a34613f3332':
Dream Settings: Disable settings icon if not selected.
Matthew Xie [Tue, 11 Sep 2012 00:15:25 +0000 (17:15 -0700)]
am
206f87c5: am
cce52bd3: Merge "Fix NPE in bluetooth Permission Activity" into jb-mr1-dev
* commit '
206f87c5b99c5653b83ba55682ab4dd622fbfe6c':
Fix NPE in bluetooth Permission Activity
Matthew Xie [Tue, 11 Sep 2012 00:15:12 +0000 (17:15 -0700)]
am
5b0e875d: am
de101033: Merge "Fixed the display count of connected panu device." into jb-mr1-dev
* commit '
5b0e875d2d50d5a805028f495262fcbab9773c11':
Fixed the display count of connected panu device.