OSDN Git Service
Amith Yamasani [Thu, 1 Aug 2013 17:26:14 +0000 (10:26 -0700)]
Add import for recently moved class
Change-Id: Iee617cf00271344bd6494824ca980c96e6df72bf
Amith Yamasani [Thu, 1 Aug 2013 17:18:39 +0000 (17:18 +0000)]
Merge "Whitelist fragments appropriate for an activity"
Lifu Tang [Wed, 31 Jul 2013 01:34:35 +0000 (18:34 -0700)]
Implemented RadioButtonPreference
Change-Id: I047b6a95f3001b60e7500f85c25d507e1ca1ad0f
Amith Yamasani [Fri, 26 Jul 2013 20:38:41 +0000 (13:38 -0700)]
Whitelist fragments appropriate for an activity
Change-Id: If4f8c4e9d9949b652946cffe0ebb09b587e5a042
Lifu Tang [Tue, 30 Jul 2013 18:43:16 +0000 (18:43 +0000)]
Merge "Moved LocationSettings into location sub-package"
Baligh Uddin [Tue, 30 Jul 2013 17:28:21 +0000 (10:28 -0700)]
am
781458b3: (-s ours) am
bdf28a18: (-s ours) am
0cb57011: (-s ours) Import translations. DO NOT MERGE
* commit '
781458b374bf0914ca96993b19f5cc52c572ff65':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Jul 2013 17:28:19 +0000 (10:28 -0700)]
am
539552e1: (-s ours) am
3ddbe519: (-s ours) Import translations. DO NOT MERGE
* commit '
539552e17c08359f1c1fd07c8b730854a9c68487':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Jul 2013 16:19:30 +0000 (09:19 -0700)]
am
bdf28a18: (-s ours) am
0cb57011: (-s ours) Import translations. DO NOT MERGE
* commit '
bdf28a1892e0116a8d6774d9c9d47033eb354368':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Jul 2013 16:15:32 +0000 (09:15 -0700)]
am
0cb57011: (-s ours) Import translations. DO NOT MERGE
* commit '
0cb57011065dd06e5faba2f4d72bbb1d31a3c309':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Jul 2013 16:12:51 +0000 (09:12 -0700)]
am
3ddbe519: (-s ours) Import translations. DO NOT MERGE
* commit '
3ddbe519f44292e33292a9aea08a5894456a3118':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Jul 2013 16:09:19 +0000 (16:09 +0000)]
Merge "Import translations. DO NOT MERGE"
Satoshi Kataoka [Tue, 30 Jul 2013 08:10:57 +0000 (08:10 +0000)]
Merge "Refactor ime settings"
Satoshi Kataoka [Mon, 29 Jul 2013 11:54:46 +0000 (20:54 +0900)]
Refactor ime settings
Bug:
8364845
Change-Id: Ie8db248314f2014278e1006b4b37aa64ce76f893
Satoshi Kataoka [Tue, 30 Jul 2013 03:52:42 +0000 (03:52 +0000)]
Merge "Fix the displayed name of the personal dictionary"
Satoshi Kataoka [Tue, 30 Jul 2013 02:54:15 +0000 (11:54 +0900)]
Fix the displayed name of the personal dictionary
Bug:
8976598
Change-Id: I3a8b50790b6da1658f32ff89df222127cb310da6
Robert Greenwalt [Mon, 29 Jul 2013 23:53:10 +0000 (16:53 -0700)]
am
5b7bf112: am
35a2d796: Merge "Fix "Add Network" show last selected WiFi AP Dialog"
* commit '
5b7bf112f55639668b34919dcf2ba19f2cfffaa3':
Fix "Add Network" show last selected WiFi AP Dialog
Robert Greenwalt [Mon, 29 Jul 2013 23:50:30 +0000 (16:50 -0700)]
am
35a2d796: Merge "Fix "Add Network" show last selected WiFi AP Dialog"
* commit '
35a2d796e3afbd7c2572c16f5c8655d89078198b':
Fix "Add Network" show last selected WiFi AP Dialog
Robert Greenwalt [Mon, 29 Jul 2013 23:43:33 +0000 (23:43 +0000)]
Merge "Fix "Add Network" show last selected WiFi AP Dialog"
Lifu Tang [Mon, 29 Jul 2013 19:07:48 +0000 (12:07 -0700)]
Moved LocationSettings into location sub-package
Change-Id: I55b30df5b6889576539b8cb880e3032f417ddfd7
Jonathan Dixon [Mon, 29 Jul 2013 18:51:32 +0000 (18:51 +0000)]
Merge "Use WebViewFactory accessors to find experimental state"
Baligh Uddin [Mon, 29 Jul 2013 17:58:35 +0000 (10:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie50baba5f53ab5e0f5894f9966c7abccdadf5a1d
Auto-generated-cl: translation import
Baligh Uddin [Mon, 29 Jul 2013 17:54:51 +0000 (10:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0ca4e8fc4396ac28c5c6d7857a988a6191e36f2c
Auto-generated-cl: translation import
Baligh Uddin [Mon, 29 Jul 2013 17:53:05 +0000 (10:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5ab9317a61cf7adb7c911ac19770e9ae7d4f935b
Auto-generated-cl: translation import
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
Zhihai Xu [Fri, 26 Jul 2013 20:33:16 +0000 (13:33 -0700)]
Add debug menu to enable btsnoop
bug:
8059358
Change-Id: Ib695aa5c9fff96d1676f718a2e3fb0bbf91eca04
Jonathan Dixon [Fri, 26 Jul 2013 02:54:31 +0000 (19:54 -0700)]
Use WebViewFactory accessors to find experimental state
This allows the knowledge of default on/off state to the contained in
the WebViewFactory class.
Change-Id: I5645b403d6232252ef36e45097c6a76e4b693dd4
Jean Chalard [Wed, 24 Jul 2013 08:21:45 +0000 (17:21 +0900)]
Fix a bug with multiple word insertion.
Bug:
7903831
Change-Id: I5202bc529a570292dd78d8503d8e2cc93b43d354
Baligh Uddin [Thu, 25 Jul 2013 03:00:05 +0000 (20:00 -0700)]
am
1d690c8a: (-s ours) am
92ce2809: am
542960fb: Import translations. DO NOT MERGE
* commit '
1d690c8a09603705052da022648ddd18a42de614':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 25 Jul 2013 02:57:34 +0000 (19:57 -0700)]
am
92ce2809: am
542960fb: Import translations. DO NOT MERGE
* commit '
92ce280985b206acfbfef896db745bc4464a4632':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 25 Jul 2013 02:56:36 +0000 (19:56 -0700)]
am
110a58ff: (-s ours) am
693abd31: Import translations. DO NOT MERGE
* commit '
110a58ff5d7b58b4a6a1711aeb74199be16e6933':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 25 Jul 2013 02:54:17 +0000 (19:54 -0700)]
am
693abd31: Import translations. DO NOT MERGE
* commit '
693abd31368cd61266c6d055fbd6ead257eb12cd':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 25 Jul 2013 02:53:29 +0000 (19:53 -0700)]
am
542960fb: Import translations. DO NOT MERGE
* commit '
542960fbbb0c122d7f3a75fd2d5c4710118417ee':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Jul 2013 19:19:37 +0000 (12:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5d5b60ba9f4ebb071940cae5173ed386993dffbd
Auto-generated-cl: translation import
Baligh Uddin [Wed, 24 Jul 2013 19:15:51 +0000 (12:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8dd4886617b33c56d57ef050c560a91748b68113
Auto-generated-cl: translation import
Baligh Uddin [Wed, 24 Jul 2013 19:14:17 +0000 (12:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iddc12747b1f57abb0a10f452b551332e86d2ba3c
Auto-generated-cl: translation import
Satoshi Kataoka [Wed, 24 Jul 2013 07:02:46 +0000 (07:02 +0000)]
Merge "Show all languages if user enables multiple subtypes"
Satoshi Kataoka [Tue, 23 Jul 2013 08:55:48 +0000 (17:55 +0900)]
Show all languages if user enables multiple subtypes
Bug:
8976598
Change-Id: Idbed69da04321a6f27033329686572d452d26f7a
Amith Yamasani [Wed, 24 Jul 2013 00:07:03 +0000 (00:07 +0000)]
Merge "Permission to manage device admins"
Alan Viverette [Tue, 23 Jul 2013 21:16:28 +0000 (21:16 +0000)]
Merge "Move accessibility settings to their own package"
Baligh Uddin [Tue, 23 Jul 2013 17:04:33 +0000 (10:04 -0700)]
am
82c51535: (-s ours) am
0d8bde94: am
6b939fe2: Import translations. DO NOT MERGE
* commit '
82c515357709d2411ceeae296fcc121f7e69d737':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Jul 2013 17:04:32 +0000 (10:04 -0700)]
am
7d77f1ac: (-s ours) am
dd00b6b0: Import translations. DO NOT MERGE
* commit '
7d77f1ac9e012c2eb64328cf5f2cbeb20100b3e2':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Jul 2013 17:02:05 +0000 (10:02 -0700)]
am
0d8bde94: am
6b939fe2: Import translations. DO NOT MERGE
* commit '
0d8bde94110681d3cc7288613c7e1204f436736c':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Jul 2013 17:02:05 +0000 (10:02 -0700)]
am
dd00b6b0: Import translations. DO NOT MERGE
* commit '
dd00b6b013dbacadb9db552b74551c452c8981c7':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Jul 2013 17:00:14 +0000 (10:00 -0700)]
am
6b939fe2: Import translations. DO NOT MERGE
* commit '
6b939fe2c8994acc3e304ec24639d07877a4b255':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Jul 2013 16:58:50 +0000 (16:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Amith Yamasani [Tue, 23 Jul 2013 16:22:13 +0000 (16:22 +0000)]
Merge "Don't show Restrictions item if it has been disabled for the user."
Satoshi Kataoka [Tue, 23 Jul 2013 08:47:07 +0000 (08:47 +0000)]
Merge "Stop redirecting the user dicitonary settings fragments"
Satoshi Kataoka [Tue, 23 Jul 2013 07:47:40 +0000 (16:47 +0900)]
Stop redirecting the user dicitonary settings fragments
Bug:
9755092
Change-Id: If4443412ca8f33e076edbe2c23c15b07b9b89fa9
Amith Yamasani [Mon, 22 Jul 2013 23:51:39 +0000 (16:51 -0700)]
Don't show Restrictions item if it has been disabled for the user.
Also don't show actual Restrictions content if the fragment was launched
through a different entry point.
Change-Id: I70cb76ca6f68a382e68219053e6f69e7f1fa0150
Amith Yamasani [Mon, 22 Jul 2013 18:23:02 +0000 (18:23 +0000)]
Merge "Remove extra padding in restrictions screen"
Amith Yamasani [Mon, 22 Jul 2013 18:22:16 +0000 (11:22 -0700)]
Remove extra padding in restrictions screen
Change-Id: Ib45d3161d9f569ba8eadf3abe4001b3047c92b74
Baligh Uddin [Mon, 22 Jul 2013 18:13:41 +0000 (11:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I090c37ae4557c04d92abb148272638d634631545
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Jul 2013 18:10:07 +0000 (11:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8c68608b9494ea120e4620cfa3c0027298c0082a
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Jul 2013 18:08:10 +0000 (11:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2f0dc917cd2d67b4478f74d0e2dccec53eb9f921
Auto-generated-cl: translation import
Satoshi Kataoka [Thu, 18 Jul 2013 05:54:53 +0000 (14:54 +0900)]
Remove the locale spinner and show the current language
Bug:
8976598
Change-Id: I092141d0cc5c6d7af499ab8ceb69275923180e37
Baligh Uddin [Fri, 19 Jul 2013 23:02:37 +0000 (16:02 -0700)]
am
50212d6c: (-s ours) am
a4a2194a: am
68b87505: Import translations. DO NOT MERGE
* commit '
50212d6c5528de767be224a3b68f736ed3cbf65b':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 19 Jul 2013 23:02:35 +0000 (16:02 -0700)]
am
8d9e3eb0: (-s ours) am
8180a3a8: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
8d9e3eb05fc0d39e39ec2fc9ad9233adb23eecb3':
Import translations. DO NOT MERGE
The Android Open Source Project [Fri, 19 Jul 2013 23:02:29 +0000 (16:02 -0700)]
am
58311f90: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
58311f908300bff0174f84d06116225c5d985107':
Use ConnectivityManager for mobile provision url
Robert Greenwalt [Fri, 19 Jul 2013 23:02:13 +0000 (16:02 -0700)]
am
ea6b5d63: am
275c1dff: am
3c087a68: Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev
* commit '
ea6b5d63d9100f014cdedf438f1750ed65b822b2':
Use ConnectivityManager for mobile provision url
Baligh Uddin [Fri, 19 Jul 2013 22:18:54 +0000 (15:18 -0700)]
am
a4a2194a: am
68b87505: Import translations. DO NOT MERGE
* commit '
a4a2194a2f4beb9f29a96249e4b3b2a4f9e80c96':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 19 Jul 2013 22:16:17 +0000 (15:16 -0700)]
am
68b87505: Import translations. DO NOT MERGE
* commit '
68b87505548be6e6734d4cfe90c450b243950455':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 19 Jul 2013 22:15:36 +0000 (15:15 -0700)]
am
8180a3a8: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
8180a3a86a36a7b9ed463f2f162e82ac06a9f1c4':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 19 Jul 2013 22:14:26 +0000 (22:14 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 19 Jul 2013 22:14:12 +0000 (22:14 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
The Android Open Source Project [Fri, 19 Jul 2013 21:21:02 +0000 (14:21 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I54f669254cc0552c2f0492d799f977854eed409b
Robert Greenwalt [Fri, 19 Jul 2013 20:43:04 +0000 (13:43 -0700)]
am
275c1dff: am
3c087a68: Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev
* commit '
275c1dff7dbec58588b0c696fc5ff4dc80ca6942':
Use ConnectivityManager for mobile provision url
Robert Greenwalt [Fri, 19 Jul 2013 20:33:33 +0000 (13:33 -0700)]
am
3c087a68: Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev
* commit '
3c087a68f6e627f48eb0cea2dfbf21b47d3ab24a':
Use ConnectivityManager for mobile provision url
Amith Yamasani [Fri, 19 Jul 2013 20:21:35 +0000 (13:21 -0700)]
Remove spurious import
Change-Id: I91172626f4ec64c0fc7497f9f7d11244ca49a341
Amith Yamasani [Fri, 19 Jul 2013 19:49:16 +0000 (19:49 +0000)]
Merge "Apply restrictions right away instead of on exit"
Amith Yamasani [Fri, 19 Jul 2013 19:37:42 +0000 (12:37 -0700)]
Permission to manage device admins
Change-Id: I4c3c86cc6c0dba16c51dc45f62e1213ad5be5df0
Robert Greenwalt [Fri, 19 Jul 2013 04:16:01 +0000 (21:16 -0700)]
am
ba32c249: resolved conflicts for merge of
4d9f670b to stage-aosp-master
* commit '
ba32c249addded770c288771748aa25d554352a0':
Fix issue 52986: Wifi settings abnormal when screen rotation
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
Alan Viverette [Fri, 19 Jul 2013 00:49:33 +0000 (17:49 -0700)]
Move accessibility settings to their own package
Change-Id: I5822bf4a81f5ade4ee0649ed30c2daa40d7e8fe2
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 [Thu, 18 Jul 2013 21:35:25 +0000 (14:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I36ca8a984f864c080cda8f14bab6fa63b3781e68
Auto-generated-cl: translation import
Baligh Uddin [Thu, 18 Jul 2013 21:31:45 +0000 (14:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ife5526347f8eab9b8b385b5b6f265c1678b8e94a
Auto-generated-cl: translation import
Baligh Uddin [Thu, 18 Jul 2013 21:30:01 +0000 (14:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I09a9a2433e7be85d771059ecd1c4a514a3f61371
Auto-generated-cl: translation import
Amith Yamasani [Tue, 2 Jul 2013 21:15:29 +0000 (14:15 -0700)]
Apply restrictions right away instead of on exit
Use usermanager to clear restrictions, as it needs to do a bunch of
book keeping.
Apply PIN restriction to master clear button.
Changing existing PIN now includes verifying the PIN, so it doesn't
need to be cleared here in Settings.
Removed automatic persisting of restrictions on receiving them unless
it is a restricted profile.
Make apps that are signed with platform certs immutable and ON.
Change-Id: Iffd1bf2eb0d18202fb66ddcf80668baa8e6b84ed
Robert Greenwalt [Tue, 16 Jul 2013 20:09:24 +0000 (13:09 -0700)]
Use ConnectivityManager for mobile provision url
bug:
9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
Robert Greenwalt [Wed, 17 Jul 2013 23:47:01 +0000 (23:47 +0000)]
Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev
Robert Greenwalt [Tue, 16 Jul 2013 20:09:24 +0000 (13:09 -0700)]
Use ConnectivityManager for mobile provision url
bug:
9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
Baligh Uddin [Tue, 16 Jul 2013 02:46:48 +0000 (19:46 -0700)]
am
f6d197a7: (-s ours) am
613cab12: am
f9d69170: Import translations. DO NOT MERGE
* commit '
f6d197a75930cfba096c4983c4f27a10158536fa':
Import translations. DO NOT MERGE
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:42:24 +0000 (19:42 -0700)]
am
48fa42b5: (-s ours) am
3f573fae: Import translations. DO NOT MERGE
* commit '
48fa42b58bd46c9f424b249827ae68beeb54c49b':
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 [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:39:06 +0000 (02:39 +0000)]
Merge "Import translations. DO NOT MERGE"
Amith Yamasani [Mon, 15 Jul 2013 22:36:49 +0000 (22:36 +0000)]
Merge "Potential fix for Settings instability on x-large."
Amith Yamasani [Mon, 15 Jul 2013 22:35:29 +0000 (15:35 -0700)]
Potential fix for Settings instability on x-large.
Bug:
9752185
Change-Id: I1b2af6661a601e1d487a35a53f5d01e58529a34d
Baligh Uddin [Mon, 15 Jul 2013 18:41:29 +0000 (11:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iea816bd3e1110127bc01ea2beacc0071ed42ed24
Auto-generated-cl: translation import
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:37:51 +0000 (09:37 -0700)]
am
f2d9e68c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
f2d9e68c238d754d00fa846b4d4c6737a24595fc':
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:14:02 +0000 (12:14 -0700)]
am
eeb90735: am
95c2a4a4: am
80bfbd53: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '
eeb90735dd7accfa34d77bcc8023412dab84bf9d':
VZW wants the phoneNumber to be 10 zero's if there isn't one.
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:55:01 +0000 (14:55 -0700)]
am
9d41a551: (-s ours) am
5ecc395e: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
9d41a551e5ceb23afb21db818626a5b377f410a9':
Import translations. DO NOT MERGE
OSDN Git Service
