OSDN Git Service
Baligh Uddin [Wed, 12 Jun 2013 19:55:00 +0000 (12:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib20c522937dfe8b4534c108832f2c04f3115c546
Auto-generated-cl: translation import
Amith Yamasani [Tue, 11 Jun 2013 18:28:04 +0000 (18:28 +0000)]
Merge "Don't show tether settings in shortcut picker"
Amith Yamasani [Tue, 11 Jun 2013 18:04:44 +0000 (11:04 -0700)]
Don't show tether settings in shortcut picker
On devices that don't have tethering options, don't allow user
to create a shortcut to the tether settings.
Bug:
6865610
Change-Id: I2ebbd6ef98391ef3fe74130570bd9b70108a2aa9
Vinit Deshapnde [Tue, 11 Jun 2013 17:45:54 +0000 (17:45 +0000)]
Merge "Fix an NPE in WifiP2pSettings UI"
Amith Yamasani [Tue, 11 Jun 2013 17:10:50 +0000 (17:10 +0000)]
Merge "Remove Battery settings if battery is not present"
Baligh Uddin [Tue, 11 Jun 2013 15:42:54 +0000 (15:42 +0000)]
Merge "Import translations. DO NOT MERGE"
Vinit Deshapnde [Mon, 10 Jun 2013 19:28:48 +0000 (12:28 -0700)]
Fix an NPE in WifiP2pSettings UI
The NPE happens becase we save a references to the group that is to be
deleted, when the confirmation dialog is being shown to the user. We lose
that reference if orientation is changed (because the UI creates a new
WifiP2pSettings to interact with).
The fix is to save the name of the group that is being deleted in
persistent store, and re-select the group based on that.
Bug:
9004915
Change-Id: I1387a5b17fa2773748f4c8b34adddfc9516cfcf3
The Android Open Source Project [Mon, 10 Jun 2013 18:11:50 +0000 (11:11 -0700)]
am
302bd5c7: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
302bd5c78a860081ce63d7faba9b20c7d9af4092':
Don't show ApnEditor as a dialog
Import translations. DO NOT MERGE
Allow hidden apps to opt-out
resolved conflicts for merge of
5d21820a to jb-mr2-dev
Fix issue #
9074296: Device Admins can activate in a way...
Ensure all active Device Admins are listed.
Baligh Uddin [Mon, 10 Jun 2013 17:06:42 +0000 (10:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I29a30e6c327e84cb2f41a123a168baf6906e577b
Auto-generated-cl: translation import
The Android Open Source Project [Mon, 10 Jun 2013 15:14:09 +0000 (08:14 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I7d22fa6b33c4e77725ae40de89fa6d83be4e8551
The Android Automerger [Sun, 9 Jun 2013 12:55:49 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Amith Yamasani [Fri, 7 Jun 2013 17:19:55 +0000 (10:19 -0700)]
Don't show ApnEditor as a dialog
Else it would be missing the menu buttons.
Bug:
7328535
Change-Id: I8e30eec0b3d23dadd9ab6f1efbaa185fe1b6b431
Baligh Uddin [Wed, 5 Jun 2013 18:51:21 +0000 (11:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4278f061c26bccc1713791f43a3cd81d69268d36
Auto-generated-cl: translation import
Amith Yamasani [Thu, 6 Jun 2013 21:48:07 +0000 (14:48 -0700)]
Allow hidden apps to opt-out
When a system app doesn't have any UI, it wasn't being considered for
opt-out. Check for all system apps that want to opt-out and mark them
for uninstallation.
Bug:
8908632
Change-Id: Iad7ccbe544cc7c7ebf73f430fbab8d295eb40219
Alex Klyubin [Thu, 6 Jun 2013 22:45:23 +0000 (15:45 -0700)]
resolved conflicts for merge of
5d21820a to jb-mr2-dev
Change-Id: If371a4571c5440ce2a0b4339f97893bf78832b31
Dianne Hackborn [Wed, 22 May 2013 18:29:36 +0000 (11:29 -0700)]
Fix issue #
9074296: Device Admins can activate in a way...
...that makes it impossible to deactive/uninstall them
Don't allow device admins to directly launch the add UI if
they are malformed.
Change-Id: I0d3140222d8015f680e1f199bddae2221ee0e726
Alex Klyubin [Wed, 22 May 2013 16:06:35 +0000 (09:06 -0700)]
Ensure all active Device Admins are listed.
Bug:
9074296
Change-Id: Ifb70c12ccea6628042b98a18186816887cb4477b
Amith Yamasani [Fri, 7 Jun 2013 21:57:38 +0000 (14:57 -0700)]
am
29294d84: am
f3e827e8: Merge "Don\'t show ApnEditor as a dialog" into jb-mr2-dev
* commit '
29294d8408c3a754ea118160d29931e5646a5e1a':
Don't show ApnEditor as a dialog
Amith Yamasani [Fri, 7 Jun 2013 21:55:09 +0000 (14:55 -0700)]
am
f3e827e8: Merge "Don\'t show ApnEditor as a dialog" into jb-mr2-dev
* commit '
f3e827e83da8d6aa70850c85bbe87d2f9feb82b1':
Don't show ApnEditor as a dialog
Amith Yamasani [Fri, 7 Jun 2013 21:53:15 +0000 (21:53 +0000)]
Merge "Don't show ApnEditor as a dialog" into jb-mr2-dev
Baligh Uddin [Fri, 7 Jun 2013 19:25:52 +0000 (12:25 -0700)]
am
e84b20ba: (-s ours) am
2db8ca13: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
e84b20ba2ff70fd4eff8d213dc9f89f1f57f15c1':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Jun 2013 19:23:44 +0000 (12:23 -0700)]
am
2db8ca13: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
2db8ca13a781be5489df614a5513240493edaeed':
Import translations. DO NOT MERGE
Chong Zhang [Fri, 7 Jun 2013 19:20:16 +0000 (19:20 +0000)]
Merge "wifi-display: change string to "In use" instead of "Busy""
Baligh Uddin [Fri, 7 Jun 2013 19:19:40 +0000 (19:19 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Amith Yamasani [Fri, 7 Jun 2013 17:49:23 +0000 (10:49 -0700)]
am
893bdcd5: am
1b79c5c8: Merge "Allow hidden apps to opt-out" into jb-mr2-dev
* commit '
893bdcd5312f314da7925f22345cb4efe0e1c442':
Allow hidden apps to opt-out
Amith Yamasani [Fri, 7 Jun 2013 17:47:24 +0000 (10:47 -0700)]
am
1b79c5c8: Merge "Allow hidden apps to opt-out" into jb-mr2-dev
* commit '
1b79c5c804e53fc63f602a5c4dcd876a0d2c7ab9':
Allow hidden apps to opt-out
Amith Yamasani [Fri, 7 Jun 2013 17:45:26 +0000 (17:45 +0000)]
Merge "Allow hidden apps to opt-out" into jb-mr2-dev
Chong Zhang [Fri, 7 Jun 2013 17:29:34 +0000 (10:29 -0700)]
wifi-display: change string to "In use" instead of "Busy"
Bug
9229799
Change-Id: Id87987812e3d65ef2a2196668f5d67b4417368d3
Amith Yamasani [Fri, 7 Jun 2013 17:19:55 +0000 (10:19 -0700)]
Don't show ApnEditor as a dialog
Else it would be missing the menu buttons.
Bug:
7328535
Change-Id: I8e30eec0b3d23dadd9ab6f1efbaa185fe1b6b431
Baligh Uddin [Fri, 7 Jun 2013 16:09:01 +0000 (16:09 +0000)]
Merge "Import translations. DO NOT MERGE"
Jaewan Kim [Tue, 4 Jun 2013 12:17:40 +0000 (21:17 +0900)]
Remove Battery settings if battery is not present
Bug:
8051556
Change-Id: I044b24e26dc3d6351c19168a2fcd085a1e761796
Chong Zhang [Fri, 7 Jun 2013 03:28:46 +0000 (03:28 +0000)]
Merge "wifi-display: grey out display if it's unavailable"
Alex Klyubin [Fri, 7 Jun 2013 00:54:40 +0000 (17:54 -0700)]
am
3c862fb5: am
681b21f3: resolved conflicts for merge of
5d21820a to jb-mr2-dev
* commit '
3c862fb5b66666c96011d065af5d7bf14ed1a2fc':
Permit deactivation of malformed Device Admins.
Alex Klyubin [Fri, 7 Jun 2013 00:51:57 +0000 (17:51 -0700)]
am
681b21f3: resolved conflicts for merge of
5d21820a to jb-mr2-dev
* commit '
681b21f3e4ef0a63d982eca0e9d1896422bc30ff':
Permit deactivation of malformed Device Admins.
Chong Zhang [Wed, 5 Jun 2013 01:38:07 +0000 (18:38 -0700)]
wifi-display: grey out display if it's unavailable
Bug
9229799
Change-Id: I981423257a6ddff9deaea7f8339944cf46c1a0ba
Alex Klyubin [Thu, 6 Jun 2013 22:45:28 +0000 (15:45 -0700)]
am
4fb1f873: am
56604046: am
5aa3f878: (-s ours) am
0c32da7e: am
6f28e342: am
9f6a1933: am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
4fb1f873bb3ef0182bc995be9ee017a8fd41fc3b':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:45:23 +0000 (15:45 -0700)]
resolved conflicts for merge of
5d21820a to jb-mr2-dev
Change-Id: If371a4571c5440ce2a0b4339f97893bf78832b31
Alex Klyubin [Thu, 6 Jun 2013 22:43:51 +0000 (15:43 -0700)]
am
56604046: am
5aa3f878: (-s ours) am
0c32da7e: am
6f28e342: am
9f6a1933: am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
56604046c5c46087aa5320d7c6aa6eb49c313637':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:41:41 +0000 (15:41 -0700)]
am
5aa3f878: (-s ours) am
0c32da7e: am
6f28e342: am
9f6a1933: am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
5aa3f8782432c79d01702ca6a7214793501bd476':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:35:41 +0000 (15:35 -0700)]
am
a65fa934: am
8bfb859e: am
8d5aeffa: am
089d1615: am
01dbfbf9: am
efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit '
a65fa934f19ebfe59a8458be733e783292ad8d9c':
Permit deactivation of malformed Device Admins.
Alex Klyubin [Thu, 6 Jun 2013 22:35:34 +0000 (15:35 -0700)]
am
0c32da7e: am
6f28e342: am
9f6a1933: am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
0c32da7ee01f7f523a889c5faf1a449e664f8bce':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:33:46 +0000 (15:33 -0700)]
am
8bfb859e: am
8d5aeffa: am
089d1615: am
01dbfbf9: am
efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit '
8bfb859e3b81a9b6448c17cfb02a0aa748580231':
Permit deactivation of malformed Device Admins.
Alex Klyubin [Thu, 6 Jun 2013 22:33:45 +0000 (15:33 -0700)]
am
6f28e342: am
9f6a1933: am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
6f28e3420ade08f05588d35937b772ffb5cdaf83':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:32:00 +0000 (15:32 -0700)]
am
8d5aeffa: am
089d1615: am
01dbfbf9: am
efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit '
8d5aeffa7dc27eba60fe4c64be6a89e645091958':
Permit deactivation of malformed Device Admins.
Alex Klyubin [Thu, 6 Jun 2013 22:32:00 +0000 (15:32 -0700)]
am
9f6a1933: am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
9f6a193394de16bfe398c8b7424f273231c77134':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:29:56 +0000 (15:29 -0700)]
am
089d1615: am
01dbfbf9: am
efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit '
089d161588f07862ac1e8876a39227e4110b2bec':
Permit deactivation of malformed Device Admins.
Alex Klyubin [Thu, 6 Jun 2013 22:29:56 +0000 (15:29 -0700)]
am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
0ffbbad5b1ad34bb2add06f7ec030191ed94e866':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:28:53 +0000 (15:28 -0700)]
am
01dbfbf9: am
efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit '
01dbfbf9c3e14253b7c3a2e822c55c013d0e4b17':
Permit deactivation of malformed Device Admins.
Alex Klyubin [Thu, 6 Jun 2013 22:28:52 +0000 (15:28 -0700)]
am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
60544e74b689c5c9e6e47e6b1c50582fe37d0a70':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:26:49 +0000 (15:26 -0700)]
am
efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit '
efd88e2c468db2169ff9bb17f2b89c246756dcda':
Permit deactivation of malformed Device Admins.
Alex Klyubin [Thu, 6 Jun 2013 22:26:48 +0000 (15:26 -0700)]
am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
3dddd8cbff8c8153363373ebe9911d67f0e50bcd':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:25:29 +0000 (22:25 +0000)]
Merge "Permit deactivation of malformed Device Admins." into jb-dev
Alex Klyubin [Thu, 6 Jun 2013 21:56:24 +0000 (14:56 -0700)]
Permit deactivation of malformed Device Admins.
Bug:
9074296
Change-Id: I4a3b2f972cb297b9f985a762219c8d67d8e3a425
Amith Yamasani [Thu, 6 Jun 2013 21:48:07 +0000 (14:48 -0700)]
Allow hidden apps to opt-out
When a system app doesn't have any UI, it wasn't being considered for
opt-out. Check for all system apps that want to opt-out and mark them
for uninstallation.
Bug:
8908632
Change-Id: Iad7ccbe544cc7c7ebf73f430fbab8d295eb40219
Jeff Sharkey [Tue, 4 Jun 2013 19:29:05 +0000 (12:29 -0700)]
Follow network stats changes.
Now Wi-Fi and mobile traffic is recorded separately, which means we
can compute much more accurate usage estimates.
Bug:
5543387
Change-Id: I26120a219649a3c84806fab0fd1602ab07509410
Alex Klyubin [Wed, 22 May 2013 16:06:35 +0000 (09:06 -0700)]
Ensure all active Device Admins are listed.
Bug:
9074296
(cherry picked from commit
d14258e50efc3677abef3cd204b67e7f26e47b56)
Conflicts:
src/com/android/settings/DeviceAdminSettings.java
Changes made to make the cherry-pick apply:
* Dropped PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS in the
PackageManager.queryBroadcastReceivers invocation. The above
flag was introduced in API Level 18.
Change-Id: I65596c49bedad7e39ceb1785859c129db1e3e6d7
Dianne Hackborn [Thu, 6 Jun 2013 19:56:54 +0000 (12:56 -0700)]
am
f750cdea: am
adc3a282: am
9cd1d5e2: (-s ours) am
a9a28d2f: am
f96a86c9: am
6d80d477: am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
f750cdea06c72ef3fa78a07410fa742436d47bcd':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:54:34 +0000 (12:54 -0700)]
am
adc3a282: am
9cd1d5e2: (-s ours) am
a9a28d2f: am
f96a86c9: am
6d80d477: am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
adc3a2825c754084728193ebf4f88b411e5b3dbc':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:51:50 +0000 (12:51 -0700)]
am
9cd1d5e2: (-s ours) am
a9a28d2f: am
f96a86c9: am
6d80d477: am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
9cd1d5e2c07248e9cc22721d9373ebf1fcf9dba2':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:35:00 +0000 (12:35 -0700)]
am
a9a28d2f: am
f96a86c9: am
6d80d477: am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
a9a28d2feeccdd2deacf6fcfb96abfcdeed58ddf':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:32:46 +0000 (12:32 -0700)]
am
f96a86c9: am
6d80d477: am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
f96a86c99d7505e15a39266967cf4d4d75295af1':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:30:51 +0000 (12:30 -0700)]
am
6d80d477: am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
6d80d477391c6ad14a6bcdb044c3351de4e20481':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:29:04 +0000 (12:29 -0700)]
am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
0bccd7e7f4d6fe4d5c7e1fef151f50ebed7addaf':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:26:39 +0000 (12:26 -0700)]
am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
5f28c77bc64deb132082eaab0ebd544ba5111bd0':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:23:05 +0000 (12:23 -0700)]
am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
d60861258169083f3174734af821fc8078ec5d2f':
Fix issue #
9074296: Device Admins can activate in a way...
Amith Yamasani [Thu, 6 Jun 2013 18:24:21 +0000 (11:24 -0700)]
am
f71f25db: am
d63bd61e: Merge "Fix NullPointerException at RunningState" into jb-mr2-dev
* commit '
f71f25dbd6d92f688dc4f9b6b76ef1c3cd6523db':
Fix NullPointerException at RunningState
Amith Yamasani [Thu, 6 Jun 2013 18:19:06 +0000 (11:19 -0700)]
am
d63bd61e: Merge "Fix NullPointerException at RunningState" into jb-mr2-dev
* commit '
d63bd61ee862db18677276b1a18b2d7938a5e193':
Fix NullPointerException at RunningState
Amith Yamasani [Thu, 6 Jun 2013 18:16:31 +0000 (18:16 +0000)]
Merge "Fix NullPointerException at RunningState" into jb-mr2-dev
The Android Open Source Project [Thu, 6 Jun 2013 17:43:03 +0000 (10:43 -0700)]
am
8548ddf2: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
8548ddf229d1438cff6904921af84814305a4ec5':
Import translations. DO NOT MERGE
The Android Open Source Project [Thu, 6 Jun 2013 17:37:41 +0000 (10:37 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I6d5d0cb4778ad82dd1943e6facc621f87b37ac28
Johan Redestig [Fri, 5 Oct 2012 08:33:16 +0000 (10:33 +0200)]
Fix NullPointerException at RunningState
getServiceInfo returns null if you have a service defined in the
manifest as: <service android:name=".Xxx" android:exported="false" />
or and in an <application> with no label or icon.
Dont crash the Settings application because of that.
Change-Id: I6f9f69c130e610b7e4ab66426177b7bade1e1515
Jeff Sharkey [Thu, 6 Jun 2013 00:51:38 +0000 (17:51 -0700)]
Always allow formatting of physical storage.
Also rebuild UI when volume state changes after a format finishes.
Bug:
8985206
Change-Id: I6208e385711b883fb6fc77cc76cbe425d740b0a8
Dianne Hackborn [Wed, 22 May 2013 18:29:36 +0000 (11:29 -0700)]
Fix issue #
9074296: Device Admins can activate in a way...
...that makes it impossible to deactive/uninstall them
Don't allow device admins to directly launch the add UI if
they are malformed.
(cherry picked from commit
8274b6770219a469ab8a5254206d0d81bd5c96d3)
Changes due to make the cherry-pick apply:
* Replaced PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS with 0
in the PackageManager.queryBroadcastReceivers invocation. The above
constant was introduced in API Level 18 only. DeviceAdminSettings
class from which this fix was extracted is not passing in the above
flag when it invokes queryBroadcastReceivers either.
Change-Id: I64d2792cd06bacbd4bfc600a10046d51a9383606
rich cannings [Wed, 29 May 2013 21:54:58 +0000 (14:54 -0700)]
Add EventLog to report lock screen type
Bug:
9075747
Change-Id: I7d3667211e76b13ccd659713c35ca86246e31e0b
Baligh Uddin [Wed, 5 Jun 2013 18:54:30 +0000 (11:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: If919cad576edb7de1b37729c6986c85cc4a4a4ee
Auto-generated-cl: translation import
Baligh Uddin [Wed, 5 Jun 2013 18:51:21 +0000 (11:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4278f061c26bccc1713791f43a3cd81d69268d36
Auto-generated-cl: translation import
The Android Automerger [Wed, 5 Jun 2013 17:21:50 +0000 (10:21 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Baligh Uddin [Mon, 3 Jun 2013 18:48:00 +0000 (11:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I59c9aa5dbbce1520b7f0a0c6357849ef9c7dbd76
Auto-generated-cl: translation import
Baligh Uddin [Mon, 3 Jun 2013 21:49:01 +0000 (14:49 -0700)]
am
ac617824: (-s ours) am
804b8b60: Import translations. DO NOT MERGE
* commit '
ac617824314daebb912d8fb6da5e1f2ed75da03b':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 3 Jun 2013 21:34:56 +0000 (14:34 -0700)]
am
804b8b60: Import translations. DO NOT MERGE
* commit '
804b8b60e7784ebbf660cf4348de24c1b2ae7146':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 3 Jun 2013 21:34:15 +0000 (21:34 +0000)]
Merge "Import translations. DO NOT MERGE"
The Android Open Source Project [Mon, 3 Jun 2013 21:07:22 +0000 (14:07 -0700)]
am
b30d81d1: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
b30d81d1dc265b0a1e59d92c996ab9734d272674':
The Android Open Source Project [Mon, 3 Jun 2013 21:03:56 +0000 (14:03 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I0c4c9a3c4d05abbbde1198c2f4d0ee170a2ef7e5
Baligh Uddin [Mon, 3 Jun 2013 18:51:17 +0000 (11:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2021f273ed726308df42cb5b90a66aa8582da40
Auto-generated-cl: translation import
Baligh Uddin [Mon, 3 Jun 2013 18:48:00 +0000 (11:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I59c9aa5dbbce1520b7f0a0c6357849ef9c7dbd76
Auto-generated-cl: translation import
The Android Automerger [Sun, 2 Jun 2013 12:55:48 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Baligh Uddin [Sat, 1 Jun 2013 16:51:53 +0000 (09:51 -0700)]
am
971d090a: (-s ours) am
eb0fff7a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
971d090a374f5192eed256eda47d174fd8ab9c30':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 1 Jun 2013 15:23:29 +0000 (08:23 -0700)]
am
eb0fff7a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
eb0fff7a9a57202ce2a1f6fc43f6dab79e7e6d36':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 31 May 2013 22:44:05 +0000 (22:44 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 31 May 2013 22:43:38 +0000 (22:43 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Przemyslaw Szczepaniak [Fri, 31 May 2013 09:57:22 +0000 (10:57 +0100)]
Adding korean input for "Listen to an example" TTS
Bug:
9186138
Change-Id: If5aed34d8ce34ef9922f8dbf0f9a83e26b931bd4
Jean-Baptiste Queru [Thu, 30 May 2013 22:43:08 +0000 (15:43 -0700)]
am
8527d6d1: am
46cd7f64: Ignore
81476405 from AOSP
* commit '
8527d6d194eb92a4f61696c0a7b298538f7cf87b':
Settings: Fix Swedish translations
Jean-Baptiste Queru [Thu, 30 May 2013 22:39:39 +0000 (15:39 -0700)]
am
46cd7f64: Ignore
81476405 from AOSP
* commit '
46cd7f64f00f530de4478137281c4d47d02c9244':
Settings: Fix Swedish translations
Jean-Baptiste Queru [Thu, 30 May 2013 22:37:47 +0000 (15:37 -0700)]
Ignore
81476405 from AOSP
Robert Greenwalt [Thu, 30 May 2013 22:16:05 +0000 (15:16 -0700)]
am
f96cfad3: am
5ac90432: Don\'t show scan-always text if it is off.
* commit '
f96cfad36ef62154b52e846736ebc407f4c03de6':
Don't show scan-always text if it is off.
Jean-Baptiste Queru [Thu, 30 May 2013 22:06:37 +0000 (22:06 +0000)]
Merge "Settings: Fix Swedish translations"
Robert Greenwalt [Thu, 30 May 2013 19:06:30 +0000 (12:06 -0700)]
am
5ac90432: Don\'t show scan-always text if it is off.
* commit '
5ac904321d81a0a0b7892c5722c464dc3c693f9f':
Don't show scan-always text if it is off.
Robert Greenwalt [Thu, 30 May 2013 18:33:36 +0000 (11:33 -0700)]
Don't show scan-always text if it is off.
bug:
9206410
Change-Id: If7e06f50d3d8db6ea198f437d4d268e65ec96c16
Baligh Uddin [Thu, 30 May 2013 02:32:14 +0000 (19:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5cf93cb32c6e8ceebe3172192d30114d84305993
Auto-generated-cl: translation import
Baligh Uddin [Thu, 30 May 2013 02:29:10 +0000 (19:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I484fae1bba709cad545b168242e79291e9599346
Auto-generated-cl: translation import