OSDN Git Service
Amith Yamasani [Thu, 12 Sep 2013 16:08:20 +0000 (16:08 +0000)]
Merge "Call to equals() comparing different types"
Robert Greenwalt [Thu, 15 Aug 2013 14:13:09 +0000 (14:13 +0000)]
Merge "Fix one NPE in tethering setting"
Jianzheng Zhou [Thu, 15 Aug 2013 06:34:52 +0000 (14:34 +0800)]
Fix one NPE in tethering setting
Once we not declare BT feature, go Setting->more->tethering
will trigger this NPE.
Change-Id: I4736e7bade261475acda74e26250a81452018ffa
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
Dianne Hackborn [Mon, 5 Aug 2013 18:11:11 +0000 (18:11 +0000)]
Merge "Fix app ops details not displaying permissions under certain conditions."
Danny Baumann [Mon, 5 Aug 2013 12:28:58 +0000 (14:28 +0200)]
Fix app ops details not displaying permissions under certain conditions.
If there's a permission that is not granted, the loop is aborted instead
of just skipping said permission.
Change-Id: Icca567ebdd818f40ad6619f258c77590074d1deb
Dianne Hackborn [Mon, 1 Jul 2013 19:54:54 +0000 (12:54 -0700)]
Completely remove app ops activity.
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
Robert Greenwalt [Mon, 29 Jul 2013 23:43:33 +0000 (23:43 +0000)]
Merge "Fix "Add Network" show last selected WiFi AP Dialog"
Birdson_Chen [Fri, 26 Jul 2013 08:48:28 +0000 (16:48 +0800)]
Fix "Add Network" show last selected WiFi AP Dialog
When user taps Wi-Fi add network button, the pop-up dialog is not empty (it shows last selected WiFi AP Dialog).
The above is observed after the following steps:
- Launch Settings application
- Turn on Wi-Fi
- Select any Wi-Fi Access Point which is not connected previously and change to portrait mode
- Press Cancel from the pop-up and select Add Network icon in menu
Because the "Rotation" operation will cause WifiDialog re-creating and the current settings
of selected Wi-Fi Access Point is saved before WifiDialog destroyed.
Then, the saved Wi-Fi Access Point is displayed when user tap on "Add Network".
It need to clear the saved Wi-Fi Access Point when WifiDialog re-creating.
Change-Id: I3e93943e5bee405329e309c3ec88a35ee9cafc43
Robert Greenwalt [Fri, 19 Jul 2013 03:52:47 +0000 (20:52 -0700)]
resolved conflicts for merge of
4d9f670b to stage-aosp-master
Change-Id: Ia5bb368dbbd857c6e201b821ae7c03a9f6f5006b
Robert Greenwalt [Fri, 19 Jul 2013 00:17:42 +0000 (00:17 +0000)]
Merge "Fix issue 52986: Wifi settings abnormal when screen rotation"
Baligh Uddin [Tue, 16 Jul 2013 02:44:11 +0000 (19:44 -0700)]
am
613cab12: am
f9d69170: Import translations. DO NOT MERGE
* commit '
613cab12188b59b907834d6e8e473219ba6306a8':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 16 Jul 2013 02:40:53 +0000 (19:40 -0700)]
am
3f573fae: Import translations. DO NOT MERGE
* commit '
3f573faef91c31198f95730614fad751b7cdc8f1':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 16 Jul 2013 02:40:53 +0000 (19:40 -0700)]
am
f9d69170: Import translations. DO NOT MERGE
* commit '
f9d691707c2acfa5808d3f7b14ec520e24c9e8c6':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 15 Jul 2013 18:38:16 +0000 (11:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5ed3429648c82e9a2cf4ca62f308639371bcfdde
Auto-generated-cl: translation import
Baligh Uddin [Mon, 15 Jul 2013 18:36:58 +0000 (11:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0f107b738c6aa5f0aeb538ccf991f64fac47fd5c
Auto-generated-cl: translation import
The Android Open Source Project [Mon, 15 Jul 2013 16:33:36 +0000 (09:33 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id0cd5164aa3d404463c520c3361cce521f3577fe
The Android Automerger [Mon, 15 Jul 2013 15:19:20 +0000 (08:19 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Wink Saville [Fri, 12 Jul 2013 19:03:54 +0000 (12:03 -0700)]
am
95c2a4a4: am
80bfbd53: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '
95c2a4a43039705f573b346026908369aa5df2b6':
VZW wants the phoneNumber to be 10 zero's if there isn't one.
Wink Saville [Fri, 12 Jul 2013 19:01:43 +0000 (12:01 -0700)]
am
80bfbd53: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '
80bfbd53151eccb8888aafc81d3dccea87cdca29':
VZW wants the phoneNumber to be 10 zero's if there isn't one.
Wink Saville [Fri, 12 Jul 2013 18:58:56 +0000 (18:58 +0000)]
Merge "VZW wants the phoneNumber to be 10 zero's if there isn't one." into jb-mr2-dev
Baligh Uddin [Thu, 11 Jul 2013 21:52:27 +0000 (14:52 -0700)]
am
5ecc395e: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
5ecc395ef2c96f899b396e937be97cc597775d8a':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Jul 2013 21:50:16 +0000 (21:50 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
Baligh Uddin [Thu, 11 Jul 2013 19:25:42 +0000 (12:25 -0700)]
am
9598002a: am
2a1ccab1: Import translations. DO NOT MERGE
* commit '
9598002ab582ca05a5ca1c3b15c8a9d5bbaee2a1':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Jul 2013 19:23:19 +0000 (12:23 -0700)]
am
2a1ccab1: Import translations. DO NOT MERGE
* commit '
2a1ccab1cdd00af6989eadba1a766120d0b10243':
Import translations. DO NOT MERGE
Wink Saville [Thu, 11 Jul 2013 05:19:26 +0000 (22:19 -0700)]
VZW wants the phoneNumber to be 10 zero's if there isn't one.
Bug:
9784059
Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859
Baligh Uddin [Thu, 11 Jul 2013 03:30:12 +0000 (20:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8112e19acd0d8d12b5435d467c40e9b93162fca8
Auto-generated-cl: translation import
Baligh Uddin [Thu, 11 Jul 2013 03:28:57 +0000 (20:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6b02734b2ef1396af16da6e8102cdbb6ca79a50c
Auto-generated-cl: translation import
Chen Hong [Wed, 10 Jul 2013 09:00:10 +0000 (17:00 +0800)]
Fix issue 52986: Wifi settings abnormal when screen rotation
When checked "Show Advanced settings" in wifi setup wifi setup wizard, and rotate the phone to landscape, the advanced settings are gone, but the checkbox is still checked. It's because of checkbox is set click listener but not checked changed listener, it can't handle checkbox's status properly.
Change-Id: I2930cab4d0878c3d91db46560f837ca21d45da4d
The Android Open Source Project [Tue, 9 Jul 2013 16:37:51 +0000 (09:37 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ib1fa3361941e032e0ff6137b37ef14eee2e794b2
The Android Automerger [Tue, 9 Jul 2013 12:55:36 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Mon, 8 Jul 2013 22:37:19 +0000 (15:37 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I5b0a5ed28f84d9e080f30feeec05975512a8b8f7
Baligh Uddin [Mon, 8 Jul 2013 21:38:21 +0000 (14:38 -0700)]
am
55077df1: am
f1d02056: Import translations. DO NOT MERGE
* commit '
55077df18a9bc29171eeb1587ec6c84101e6fa64':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Jul 2013 21:38:18 +0000 (14:38 -0700)]
am
20a554fa: Import translations. DO NOT MERGE
* commit '
20a554fa50620fc51951a12f16a27f83168f4ce3':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Jul 2013 21:35:21 +0000 (14:35 -0700)]
am
f1d02056: Import translations. DO NOT MERGE
* commit '
f1d02056d967b2660424f181ce547b846a92fdec':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Jul 2013 16:18:57 +0000 (09:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5abf06c94c0aa4a90a11b0a14fe6f04ec6d003c9
Auto-generated-cl: translation import
Baligh Uddin [Mon, 8 Jul 2013 16:17:21 +0000 (09:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7d34201de76770bcb6a1998c6d898830ca290006
Auto-generated-cl: translation import
The Android Automerger [Mon, 8 Jul 2013 12:55:42 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Wed, 3 Jul 2013 21:33:10 +0000 (14:33 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I1529161d81082d96363ffb02eab90da17a1ec71e
Baligh Uddin [Wed, 3 Jul 2013 21:27:40 +0000 (14:27 -0700)]
am
8bd9f2f2: am
76185f72: Import translations. DO NOT MERGE
* commit '
8bd9f2f287dec8ff9abb4de1830a1a91fc7212c2':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Jul 2013 21:27:39 +0000 (14:27 -0700)]
am
df0ad0dc: am
aa03b2f6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
df0ad0dc86b41b009943f97956b7a36b00c9eef8':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Jul 2013 21:24:47 +0000 (14:24 -0700)]
am
76185f72: Import translations. DO NOT MERGE
* commit '
76185f7201b3e8a2d341a62c13f8ac259203a7e7':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Jul 2013 21:24:47 +0000 (14:24 -0700)]
am
aa03b2f6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
aa03b2f6a61bc2ea4e7ad9b07a2841363a3a7a73':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Jul 2013 21:21:03 +0000 (14:21 -0700)]
am
ad965c17: Import translations. DO NOT MERGE
* commit '
ad965c173bd5a6f98d14a6e1ef83087cc55bd5ef':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Jul 2013 20:56:12 +0000 (13:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I45c8315e3a471262b48485768ba402b35b559886
Auto-generated-cl: translation import
Baligh Uddin [Wed, 3 Jul 2013 20:54:27 +0000 (13:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia71c4566436300b1c190865f9dc0d490d62d8ebb
Auto-generated-cl: translation import
Baligh Uddin [Tue, 2 Jul 2013 19:33:11 +0000 (12:33 -0700)]
am
e462f0d5: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
e462f0d5b9b131523240795c23dc6ec39fb19306':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 2 Jul 2013 16:34:32 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
Baligh Uddin [Tue, 2 Jul 2013 16:34:18 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
The Android Automerger [Tue, 2 Jul 2013 12:55:33 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Wink Saville [Mon, 1 Jul 2013 23:33:01 +0000 (16:33 -0700)]
am
7319f2b1: am
5d5a269f: Add Manage mobile plan to Settings.
* commit '
7319f2b123772d72417cd09e8f3f04441c93d13d':
Add Manage mobile plan to Settings.
Wink Saville [Mon, 1 Jul 2013 23:31:35 +0000 (16:31 -0700)]
am
5d5a269f: Add Manage mobile plan to Settings.
* commit '
5d5a269f59aa5caa986eff3cb988d7585b2cd43c':
Add Manage mobile plan to Settings.
Wink Saville [Sat, 29 Jun 2013 14:54:13 +0000 (07:54 -0700)]
Add Manage mobile plan to Settings.
Bug:
9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
Baligh Uddin [Mon, 1 Jul 2013 16:20:37 +0000 (09:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2fb9c2692fa420eee7416690dc768a966ff1a9b9
Auto-generated-cl: translation import
Baligh Uddin [Mon, 1 Jul 2013 16:19:04 +0000 (09:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I69c1ffe7da49a43516d5233f6f4c7cec6227eb04
Auto-generated-cl: translation import
The Android Open Source Project [Mon, 1 Jul 2013 14:43:20 +0000 (07:43 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I6534b46c13c3ae03f703e70a546f54a59fc4adc0
The Android Automerger [Sun, 30 Jun 2013 12:55:34 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Robert Greenwalt [Fri, 28 Jun 2013 15:08:17 +0000 (08:08 -0700)]
am
5d3ef571: am
a1454529: Merge "Dont enable Wi-Fi if it\'s not toggleable in flight mode"
* commit '
5d3ef5715c43ca9c3c969deaf25c76a7d3e27624':
Dont enable Wi-Fi if it's not toggleable in flight mode
Robert Greenwalt [Fri, 28 Jun 2013 15:06:25 +0000 (08:06 -0700)]
am
a1454529: Merge "Dont enable Wi-Fi if it\'s not toggleable in flight mode"
* commit '
a1454529c3eb6d0e87b254888abfea3bb714f7fe':
Dont enable Wi-Fi if it's not toggleable in flight mode
Robert Greenwalt [Fri, 28 Jun 2013 15:05:16 +0000 (15:05 +0000)]
Merge "Dont enable Wi-Fi if it's not toggleable in flight mode"
Johan Redestig [Fri, 28 Jun 2013 08:37:07 +0000 (10:37 +0200)]
Dont enable Wi-Fi if it's not toggleable in flight mode
Dont enable Wi-Fi if it's not toggleable in flight mode
by restoring the return which was removed by
e78c1879058571c00879f0d3e756951302adf513
Change-Id: I8ca5a3e9b3f36f148f08ce97b8a2b854bf7de21c
Elliott Hughes [Thu, 27 Jun 2013 21:59:08 +0000 (14:59 -0700)]
am
add37ef4: am
5f6e4339: Merge "Use SimpleDateFormat for time zone formatting."
* commit '
add37ef4f2721bc791319e6794b310cfbd802533':
Use SimpleDateFormat for time zone formatting.
Elliott Hughes [Thu, 27 Jun 2013 21:55:54 +0000 (14:55 -0700)]
am
5f6e4339: Merge "Use SimpleDateFormat for time zone formatting."
* commit '
5f6e43394dd89432b241f32cd2c96d87c3ad5040':
Use SimpleDateFormat for time zone formatting.
Elliott Hughes [Thu, 27 Jun 2013 21:52:23 +0000 (21:52 +0000)]
Merge "Use SimpleDateFormat for time zone formatting."
Amith Yamasani [Thu, 27 Jun 2013 21:52:24 +0000 (14:52 -0700)]
am
51d2ff75: am
bf87f7d7: Fix inconsistent string
* commit '
51d2ff7561dafdb1371c46e5a5f1e0505bdbbb5e':
Fix inconsistent string
Amith Yamasani [Thu, 27 Jun 2013 21:46:36 +0000 (14:46 -0700)]
am
bf87f7d7: Fix inconsistent string
* commit '
bf87f7d78d7c09f6b928cc0a33e77c5130436c72':
Fix inconsistent string
Amith Yamasani [Thu, 27 Jun 2013 16:41:15 +0000 (09:41 -0700)]
Fix inconsistent string
Bug:
9602425
Change-Id: I2c5a2350668e48f12e821e0553df56ed08d373f5
The Android Open Source Project [Tue, 25 Jun 2013 23:13:54 +0000 (16:13 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ia9e51b0778c662f1da131e33627cacf6356898fc
Elliott Hughes [Tue, 25 Jun 2013 17:16:27 +0000 (10:16 -0700)]
Use SimpleDateFormat for time zone formatting.
There's no need to do time zone formatting manually.
Change-Id: Ibef222d11d04a327e9ef64ddc48322558028555d
Elliott Hughes [Tue, 25 Jun 2013 16:57:43 +0000 (09:57 -0700)]
am
b17fef80: am
02e23fb0: Merge "Clamp date setting for the SetupWizard as well as Settings."
* commit '
b17fef801f4c26fdf116d706c3b9e30b522cb229':
Clamp date setting for the SetupWizard as well as Settings.
Elliott Hughes [Tue, 25 Jun 2013 16:56:06 +0000 (09:56 -0700)]
am
02e23fb0: Merge "Clamp date setting for the SetupWizard as well as Settings."
* commit '
02e23fb0eb96280c7874d8b5d65b56bb9fc284ba':
Clamp date setting for the SetupWizard as well as Settings.
Elliott Hughes [Tue, 25 Jun 2013 16:53:20 +0000 (16:53 +0000)]
Merge "Clamp date setting for the SetupWizard as well as Settings."
Elliott Hughes [Mon, 24 Jun 2013 23:11:19 +0000 (16:11 -0700)]
Clamp date setting for the SetupWizard as well as Settings.
We fixed this for Settings in
7ccfa0614caeba8eba5d3040a90541a24fa1e6c9,
but @sonymobile.com point out that it's still broken for SetupWizard.
Change-Id: I59348200105246f3ed7c0892e5f19b901d3e95ac
The Android Automerger [Mon, 24 Jun 2013 21:55:10 +0000 (14:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 24 Jun 2013 21:42:16 +0000 (14:42 -0700)]
Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD
The Android Open Source Project [Fri, 21 Jun 2013 18:57:15 +0000 (11:57 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ide168995c4998dc00d65ced6e3187985566f8f49
The Android Automerger [Fri, 21 Jun 2013 18:35:55 +0000 (11:35 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Dianne Hackborn [Thu, 20 Jun 2013 21:40:57 +0000 (14:40 -0700)]
am
67571084: am
5da4c907: Merge "Fix issue #
9486022: Disabled Apps column doesn\'t always show up in Manage Apps" into jb-mr2-dev
* commit '
675710849a1209f929e387b19e3a7705f702f5bd':
Fix issue #
9486022: Disabled Apps column doesn't always show up in Manage Apps
Dianne Hackborn [Thu, 20 Jun 2013 21:39:39 +0000 (14:39 -0700)]
am
5da4c907: Merge "Fix issue #
9486022: Disabled Apps column doesn\'t always show up in Manage Apps" into jb-mr2-dev
* commit '
5da4c9079cc06c4ff4117cf6021d2e0800c99f37':
Fix issue #
9486022: Disabled Apps column doesn't always show up in Manage Apps
Dianne Hackborn [Thu, 20 Jun 2013 21:38:29 +0000 (21:38 +0000)]
Merge "Fix issue #
9486022: Disabled Apps column doesn't always show up in Manage Apps" into jb-mr2-dev
Baligh Uddin [Thu, 20 Jun 2013 16:31:52 +0000 (09:31 -0700)]
am
178baecf: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
178baecf987e3aee0c29edfdf0b9ea5c3de1ec1d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Jun 2013 16:27:38 +0000 (16:27 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
Baligh Uddin [Thu, 20 Jun 2013 15:36:12 +0000 (08:36 -0700)]
am
e0878e35: am
80a0d9a3: Import translations. DO NOT MERGE
* commit '
e0878e357023c260ed41dec8b20da7e9a265b2fa':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Jun 2013 15:33:56 +0000 (08:33 -0700)]
am
80a0d9a3: Import translations. DO NOT MERGE
* commit '
80a0d9a37c4c70c538bce0ae7bc2fd83339e15ac':
Import translations. DO NOT MERGE
The Android Open Source Project [Thu, 20 Jun 2013 14:18:40 +0000 (07:18 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I4e1415d265b543bcfb24dc7b520162fee1f48806
Dianne Hackborn [Thu, 20 Jun 2013 00:01:51 +0000 (17:01 -0700)]
Fix issue #
9486022: Disabled Apps column doesn't always show up in Manage Apps
We need to resume the current tab before checking to see if
there are any disabled apps and deciding from that the number
of tabs to show.
Change-Id: I95037f15ff7a97f0234143d10ebcee79224a3114
Baligh Uddin [Wed, 19 Jun 2013 19:41:33 +0000 (12:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie094379c6e1458b839192420b31291372b09dfda
Auto-generated-cl: translation import
Baligh Uddin [Wed, 19 Jun 2013 19:40:06 +0000 (12:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia1811e28f847bc50278d40cfe989e2fa284d0f12
Auto-generated-cl: translation import
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
Baligh Uddin [Mon, 17 Jun 2013 19:03:54 +0000 (12:03 -0700)]
am
7a42c809: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
7a42c80935c41b5db3151354f4a70d5a46413b74':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 17 Jun 2013 19:01:51 +0000 (19:01 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
Baligh Uddin [Mon, 17 Jun 2013 16:30:03 +0000 (09:30 -0700)]
am
f7c2889c: am
7f37c30b: (-s ours) Import translations. DO NOT MERGE
* commit '
f7c2889c451474eab1b4b86013e04b720eacc68e':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 17 Jun 2013 16:27:45 +0000 (09:27 -0700)]
am
7f37c30b: (-s ours) Import translations. DO NOT MERGE
* commit '
7f37c30b713e29494f00c85916fc4fee246f2936':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 17 Jun 2013 16:15:49 +0000 (09:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I37d7ec7d90da8ac2f9b4b48e75ddbaea44f02ae1
Auto-generated-cl: translation import
Baligh Uddin [Mon, 17 Jun 2013 16:14:19 +0000 (09:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7da4461fe8f9c64191a5e0c46ae6d5ad4d7293a1
Auto-generated-cl: translation import
The Android Open Source Project [Thu, 13 Jun 2013 15:22:53 +0000 (08:22 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id19d096814424b1c1253d633f9bc0e18d53dc360
The Android Automerger [Thu, 13 Jun 2013 12:55:31 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Thu, 13 Jun 2013 01:04:45 +0000 (18:04 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I5a23b290d9a03dbae2ac2cbb7bcdebe84a773c55
Baligh Uddin [Wed, 12 Jun 2013 19:51:36 +0000 (12:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5b53d1be101da33a7aaa664eccf887e0b17c0b97
Auto-generated-cl: translation import
Baligh Uddin [Wed, 12 Jun 2013 20:22:08 +0000 (13:22 -0700)]
am
0117cc7c: Import translations. DO NOT MERGE
* commit '
0117cc7ce562569d32fc18341111100068d11eff':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Jun 2013 19:51:36 +0000 (12:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5b53d1be101da33a7aaa664eccf887e0b17c0b97
Auto-generated-cl: translation import
OSDN Git Service
