OSDN Git Service
Elliott Hughes [Sat, 8 Dec 2012 17:55:08 +0000 (09:55 -0800)]
Merge "Makes the add button for new APNs appear in the action bar."
Wink Saville [Thu, 6 Dec 2012 16:51:22 +0000 (08:51 -0800)]
Merge "Format change at "Mobile network type" value"
Akira Oshimi [Thu, 18 Oct 2012 09:14:00 +0000 (18:14 +0900)]
Format change at "Mobile network type" value
Remove "network type Number" from "mobile network type" value
at "About Phone > Status".
For example value "UNKNOWN:0" became "UNKNOWN"
(if value is "UNKNOWN", the word is localized)
The number ":0" did not add much value to the user.
Change-Id: Iee29fa2ab42f2d6eab5d9dbd6f647087ee382648
Jeff Sharkey [Wed, 28 Nov 2012 18:23:30 +0000 (10:23 -0800)]
Merge "Settings: fix storage measurement for device without emulated sdcard"
The Android Open Source Project [Tue, 27 Nov 2012 16:21:40 +0000 (08:21 -0800)]
Merge jb-mr1-dev into aosp/master - do not merge
Change-Id: I07ffd44995f02108e9a981fd590e7e29ff813e7f
Pawit Pornkitprasan [Fri, 23 Nov 2012 09:42:11 +0000 (16:42 +0700)]
Settings: fix storage measurement for device without emulated sdcard
StorageMeasurement: misc files should only be measured for internal
storage only if it is the emulated storage, otherwise misc count
for the primary storage will be erroneously duplicated on the
internal storage count.
StorageVolumePreferenceCategory:
- Always create mMountTogglePreference to avoid null pointer
exception for code that relies on it existing
- Check if the keys exist before calculating totalValues to
avoid null pointer exception on storage where media is not
calculated
- For available/readonly, set title, not summary (summary is
supposed to be the amount available)
Change-Id: Ib217f79ee562dffc514696fff038e58ed0dba7d9
Baligh Uddin [Fri, 23 Nov 2012 07:18:51 +0000 (23:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I21102fa6155368b3948a2606f9e30fde08b508b1
Auto-generated-cl: translation import
Baligh Uddin [Wed, 21 Nov 2012 08:04:32 +0000 (00:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: I275d3bec8048e4da0d30b6deabc6966f6b0785fe
Auto-generated-cl: translation import
Baligh Uddin [Fri, 16 Nov 2012 23:51:59 +0000 (15:51 -0800)]
Import translations. DO NOT MERGE
Change-Id: If48dc63e0112cc63e76b635047b38cde4b33ea06
Auto-generated-cl: translation import
Baligh Uddin [Wed, 14 Nov 2012 20:41:58 +0000 (12:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4d8e15ea1297b2ec3efd3decd24629e4b6360e76
Auto-generated-cl: translation import
Baligh Uddin [Sat, 10 Nov 2012 06:45:13 +0000 (22:45 -0800)]
am
3206fb2b: am
42d97684: am
a0fbc220: Import translations. DO NOT MERGE
* commit '
3206fb2bb2fff97db47f1eeb3e0e0b7025f7fada':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 10 Nov 2012 06:42:02 +0000 (22:42 -0800)]
am
42d97684: am
a0fbc220: Import translations. DO NOT MERGE
* commit '
42d976842081d3e40cdc68774573fedd90f21575':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 10 Nov 2012 00:15:59 +0000 (16:15 -0800)]
am
7468d94e: Import translations. DO NOT MERGE
* commit '
7468d94e31301ba3e0accb15cc26cd47438e1642':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 10 Nov 2012 00:15:33 +0000 (16:15 -0800)]
am
a0fbc220: Import translations. DO NOT MERGE
* commit '
a0fbc220bb401f97103a0a22d14a45e33ca7a149':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 9 Nov 2012 19:53:40 +0000 (11:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I520c6d173124c8645fdfa2eb3db251f704c656c3
Auto-generated-cl: translation import
Baligh Uddin [Fri, 9 Nov 2012 19:51:15 +0000 (11:51 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia83d3a7041a3af738961ccf10bc96d540bc1f147
Auto-generated-cl: translation import
The Android Open Source Project [Thu, 8 Nov 2012 23:47:52 +0000 (15:47 -0800)]
am
fee1840f: am
15d91c6e: Reconcile with jb-mr1-release - do not merge
* commit '
fee1840f3d6d68c5f3d4e4ab9372305e154c64a9':
Michael Jurka [Thu, 8 Nov 2012 23:47:42 +0000 (15:47 -0800)]
am
8bb938dc: am
ffffbf40: am
d9609fc0: Fix jank after adding a widget for lock screen
* commit '
8bb938dcc9a7d1c9f465439121171793fb405d14':
Fix jank after adding a widget for lock screen
Michael Jurka [Thu, 8 Nov 2012 23:47:41 +0000 (15:47 -0800)]
am
80eed80e: am
caf13b22: am
a108d9fc: Final tweaks to visuals of widget picker
* commit '
80eed80e3b048672ac09c297a4971e79dd480d45':
Final tweaks to visuals of widget picker
Baligh Uddin [Thu, 8 Nov 2012 23:43:47 +0000 (15:43 -0800)]
am
90ef462c: am
09256980: am
c74ef2f2: am
7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
90ef462ca76a6c800feddc125badb6f483782b6e':
Baligh Uddin [Thu, 8 Nov 2012 23:42:36 +0000 (15:42 -0800)]
am
c25bfc07: am
4f1a0932: am
7d6a0f9c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
c25bfc07af873793abb19fe95295aa8bf0cd2ebc':
Import translations. DO NOT MERGE
The Android Open Source Project [Thu, 8 Nov 2012 23:42:14 +0000 (15:42 -0800)]
am
c8c23821: am
1a37da3b: Reconcile with jb-mr1-release - do not merge
* commit '
c8c238212ded8d4e774ad7cdc06de58626fedce2':
The Android Open Source Project [Thu, 8 Nov 2012 22:22:21 +0000 (14:22 -0800)]
am
15d91c6e: Reconcile with jb-mr1-release - do not merge
* commit '
15d91c6e825d6529cf03478410c3ff92d8879b53':
The Android Open Source Project [Thu, 8 Nov 2012 22:19:27 +0000 (14:19 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Iaa26de823282e7aba1ec495c04de885dd5267982
The Android Automerger [Thu, 8 Nov 2012 21:54:19 +0000 (13:54 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Michael Jurka [Thu, 8 Nov 2012 21:15:32 +0000 (13:15 -0800)]
am
ffffbf40: am
d9609fc0: Fix jank after adding a widget for lock screen
* commit '
ffffbf400b528262ffee791a0c607a6d2affed72':
Fix jank after adding a widget for lock screen
Michael Jurka [Thu, 8 Nov 2012 21:15:31 +0000 (13:15 -0800)]
am
caf13b22: am
a108d9fc: Final tweaks to visuals of widget picker
* commit '
caf13b22c072dc48ace4c53065c78fd0dac131ef':
Final tweaks to visuals of widget picker
Michael Jurka [Thu, 8 Nov 2012 21:10:47 +0000 (13:10 -0800)]
am
d9609fc0: Fix jank after adding a widget for lock screen
* commit '
d9609fc0a2be07e9100dbb83f3549dad1d9b3c51':
Fix jank after adding a widget for lock screen
Michael Jurka [Thu, 8 Nov 2012 21:10:46 +0000 (13:10 -0800)]
am
a108d9fc: Final tweaks to visuals of widget picker
* commit '
a108d9fc0edd3b4f741fae595e35a246fbc700ff':
Final tweaks to visuals of widget picker
Baligh Uddin [Thu, 8 Nov 2012 14:27:27 +0000 (06:27 -0800)]
am
c3876ebb: am
f654e3bb: am
9d41995b: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
c3876ebb450bd8fbba14d03bdf278243dc825c2d':
Import translations. DO NOT MERGE
Michael Jurka [Thu, 8 Nov 2012 14:27:26 +0000 (06:27 -0800)]
am
4ee20f36: am
4e773619: am
f5336fd1: Allowing rotation while adding lockscreen widgets
* commit '
4ee20f36fa71fc0ecd0d1cd3c46d271e7096376d':
Allowing rotation while adding lockscreen widgets
Michael Jurka [Thu, 8 Nov 2012 14:27:25 +0000 (06:27 -0800)]
am
f31af7d1: am
ef2b86b4: am
a487bca4: Updated layouts for keyguard widget picker
* commit '
f31af7d14f88ed6cf2c5c6b6067cc9436d98b110':
Updated layouts for keyguard widget picker
Michael Jurka [Thu, 8 Nov 2012 14:27:24 +0000 (06:27 -0800)]
am
686e8287: am
02dd6c42: am
c0fb8a39: Merge "Updated assets." into jb-mr1-lockscreen-dev
* commit '
686e8287a0b3799aa75258676fc7546691e1a4df':
Updated assets.
Michael Jurka [Thu, 8 Nov 2012 14:27:23 +0000 (06:27 -0800)]
am
504bd1ee: am
ddf272da: am
5c5eff45: Pass argument to lock screen to show widget after adding it
* commit '
504bd1eede2d96260b90a9bdf93d719851605642':
Pass argument to lock screen to show widget after adding it
Michael Jurka [Thu, 8 Nov 2012 14:27:21 +0000 (06:27 -0800)]
am
bd533781: am
2419d2ed: am
4119788b: Add widget previews to the key guard widget picker
* commit '
bd5337813f73de3a218ca924163c1a48ef64ff6c':
Add widget previews to the key guard widget picker
Baligh Uddin [Thu, 8 Nov 2012 14:26:53 +0000 (06:26 -0800)]
am
cbc0d030: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
cbc0d03093710961bd9abaf0e0f076a2da08ff7d':
Import translations. DO NOT MERGE
The Android Open Source Project [Thu, 8 Nov 2012 14:12:41 +0000 (06:12 -0800)]
am
a60f3ae7: am
5a051a7f: Reconcile with jb-mr1-release - do not merge
* commit '
a60f3ae723844f72cf81ee442b3a9babf793f731':
Baligh Uddin [Thu, 8 Nov 2012 02:34:44 +0000 (18:34 -0800)]
am
09256980: am
c74ef2f2: am
7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
09256980960cd5de7633f3a0f69cef2a676a6812':
Baligh Uddin [Thu, 8 Nov 2012 02:29:07 +0000 (18:29 -0800)]
am
c74ef2f2: am
7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
c74ef2f28b1b095ecb3dea78ff8d277daec84f58':
Michael Jurka [Thu, 8 Nov 2012 00:54:35 +0000 (16:54 -0800)]
Fix jank after adding a widget for lock screen
After adding a widget, you see a black flash, but
there's also a small sliver of wallpaper left
showing. This change covers up that small bit
of wallpaper.
Bug:
7381803
Michael Jurka [Wed, 7 Nov 2012 23:31:47 +0000 (15:31 -0800)]
Final tweaks to visuals of widget picker
Baligh Uddin [Wed, 7 Nov 2012 19:53:29 +0000 (11:53 -0800)]
am
4f1a0932: am
7d6a0f9c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
4f1a09320321cc758df1d33358e6353d3614bdb0':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Nov 2012 19:51:32 +0000 (11:51 -0800)]
am
7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
7d6a0f9c8b9494e3b735ea98836ff3b826e11c8e':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Nov 2012 19:50:53 +0000 (11:50 -0800)]
am
7d6a0f9c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
7d6a0f9c8b9494e3b735ea98836ff3b826e11c8e':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Nov 2012 19:49:24 +0000 (11:49 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
The Android Open Source Project [Wed, 7 Nov 2012 19:37:20 +0000 (11:37 -0800)]
am
1a37da3b: Reconcile with jb-mr1-release - do not merge
* commit '
1a37da3bf44546f41734fd7ffdac066a256ea271':
The Android Open Source Project [Wed, 7 Nov 2012 19:35:14 +0000 (11:35 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I0c96fcfe474c0536ddfaaea7705b4956df0e0f43
The Android Automerger [Wed, 7 Nov 2012 19:18:19 +0000 (11:18 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Wed, 7 Nov 2012 19:14:08 +0000 (11:14 -0800)]
am
f654e3bb: am
9d41995b: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
f654e3bb5b340360690c45b88442d9bf454fa44c':
Import translations. DO NOT MERGE
Michael Jurka [Wed, 7 Nov 2012 19:14:07 +0000 (11:14 -0800)]
am
4e773619: am
f5336fd1: Allowing rotation while adding lockscreen widgets
* commit '
4e7736193118373836c6fd558c4142972d6a74e2':
Allowing rotation while adding lockscreen widgets
Michael Jurka [Wed, 7 Nov 2012 19:14:06 +0000 (11:14 -0800)]
am
ef2b86b4: am
a487bca4: Updated layouts for keyguard widget picker
* commit '
ef2b86b40a207b21c7f6b056552a44278d0533f1':
Updated layouts for keyguard widget picker
Michael Jurka [Wed, 7 Nov 2012 19:14:05 +0000 (11:14 -0800)]
am
02dd6c42: am
c0fb8a39: Merge "Updated assets." into jb-mr1-lockscreen-dev
* commit '
02dd6c423c362a2975cd2cb33bf98355c3083647':
Updated assets.
Michael Jurka [Wed, 7 Nov 2012 19:14:03 +0000 (11:14 -0800)]
am
ddf272da: am
5c5eff45: Pass argument to lock screen to show widget after adding it
* commit '
ddf272dae119191a5314a8ac76edb53469ed5bec':
Pass argument to lock screen to show widget after adding it
Michael Jurka [Wed, 7 Nov 2012 19:14:02 +0000 (11:14 -0800)]
am
2419d2ed: am
4119788b: Add widget previews to the key guard widget picker
* commit '
2419d2ed3c20261edf18761b87a8bd7b7713171e':
Add widget previews to the key guard widget picker
Baligh Uddin [Wed, 7 Nov 2012 19:11:53 +0000 (11:11 -0800)]
am
9d41995b: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
9d41995bd1f158b852b6a12d73390535690b8b7e':
Import translations. DO NOT MERGE
Michael Jurka [Wed, 7 Nov 2012 19:11:51 +0000 (11:11 -0800)]
am
f5336fd1: Allowing rotation while adding lockscreen widgets
* commit '
f5336fd114e557fce06197041aab70217308fe90':
Allowing rotation while adding lockscreen widgets
Michael Jurka [Wed, 7 Nov 2012 19:11:50 +0000 (11:11 -0800)]
am
a487bca4: Updated layouts for keyguard widget picker
* commit '
a487bca4700a9dbd5d5d72913d0265ae86815edf':
Updated layouts for keyguard widget picker
Michael Jurka [Wed, 7 Nov 2012 19:11:49 +0000 (11:11 -0800)]
am
c0fb8a39: Merge "Updated assets." into jb-mr1-lockscreen-dev
* commit '
c0fb8a399be0b3e4b365682c681ff24264bbef14':
Updated assets.
Michael Jurka [Wed, 7 Nov 2012 19:11:48 +0000 (11:11 -0800)]
am
5c5eff45: Pass argument to lock screen to show widget after adding it
* commit '
5c5eff45e97a2bb1b55befb87eb535a438a7bbf8':
Pass argument to lock screen to show widget after adding it
Michael Jurka [Wed, 7 Nov 2012 19:11:47 +0000 (11:11 -0800)]
am
4119788b: Add widget previews to the key guard widget picker
* commit '
4119788b1be5d9b51e3c5cfe4e32f2aacc5a2f8f':
Add widget previews to the key guard widget picker
Baligh Uddin [Wed, 7 Nov 2012 18:03:25 +0000 (10:03 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Wed, 7 Nov 2012 18:02:52 +0000 (10:02 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Michael Jurka [Wed, 7 Nov 2012 09:11:28 +0000 (01:11 -0800)]
Allowing rotation while adding lockscreen widgets
Also cleaning up some unused code
Bug:
7468012
Michael Jurka [Wed, 7 Nov 2012 05:08:31 +0000 (21:08 -0800)]
Updated layouts for keyguard widget picker
Bug:
7381803
Change-Id: I9a6a8fe3216002b486e7b6ddf7544d9fc4e73de8
Michael Jurka [Wed, 7 Nov 2012 05:10:21 +0000 (21:10 -0800)]
Merge "Updated assets." into jb-mr1-lockscreen-dev
Daniel Sandler [Wed, 7 Nov 2012 05:03:34 +0000 (00:03 -0500)]
Updated assets.
Change-Id: Ib4e02eb1c43523e86ad8828835f76436ebb82506
Michael Jurka [Wed, 7 Nov 2012 00:22:04 +0000 (16:22 -0800)]
Pass argument to lock screen to show widget
after adding it
Baligh Uddin [Wed, 7 Nov 2012 00:13:52 +0000 (16:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iae38ab79b4108a612ed9048c7d3282c6287ae84b
Auto-generated-cl: translation import
Baligh Uddin [Wed, 7 Nov 2012 00:11:40 +0000 (16:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9e48644d4717391f86c10a609470c429769114e7
Auto-generated-cl: translation import
Baligh Uddin [Wed, 7 Nov 2012 00:09:13 +0000 (16:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iad0dcfb3ccccfb814a7ba85ae346fe5dd3336d48
Auto-generated-cl: translation import
Michael Jurka [Sat, 3 Nov 2012 06:05:34 +0000 (23:05 -0700)]
Add widget previews to the key guard widget picker
Bug:
7381803
Change-Id: I86946b7d0d75f8a1f89120600be2513bdf9026f0
The Android Open Source Project [Tue, 6 Nov 2012 21:29:17 +0000 (13:29 -0800)]
am
5a051a7f: Reconcile with jb-mr1-release - do not merge
* commit '
5a051a7f0af2e206afd8c1e765eb80690345a536':
The Android Open Source Project [Tue, 6 Nov 2012 21:26:57 +0000 (13:26 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ibf539c16a9086609d5baf494ea5156c8967d02a5
The Android Automerger [Tue, 6 Nov 2012 21:13:42 +0000 (13:13 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Michael Jurka [Tue, 6 Nov 2012 20:48:24 +0000 (12:48 -0800)]
am
b19c4ced: am
701d8a0e: am
ab3472f5: Supporting EXTRA_APPWIDGET_OPTIONS correctly
* commit '
b19c4ced11debd52313d9bfcb3b66dabba84b5b1':
Supporting EXTRA_APPWIDGET_OPTIONS correctly
Michael Jurka [Tue, 6 Nov 2012 20:46:14 +0000 (12:46 -0800)]
am
701d8a0e: am
ab3472f5: Supporting EXTRA_APPWIDGET_OPTIONS correctly
* commit '
701d8a0e1af9d667b5c03a30ffb275359f048415':
Supporting EXTRA_APPWIDGET_OPTIONS correctly
Michael Jurka [Tue, 6 Nov 2012 20:38:24 +0000 (12:38 -0800)]
am
ab3472f5: Supporting EXTRA_APPWIDGET_OPTIONS correctly
* commit '
ab3472f5946c5dc3193c29513e31be7309ece378':
Supporting EXTRA_APPWIDGET_OPTIONS correctly
The Android Open Source Project [Tue, 6 Nov 2012 20:37:59 +0000 (12:37 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I538dcad23578c67aac157ea9c60b5e27da195d69
The Android Open Source Project [Tue, 6 Nov 2012 20:29:51 +0000 (12:29 -0800)]
am
374808ea: am
f9bac006: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
374808ea223870c2ef12b009bbf6bb6b29a3d4b5':
The Android Open Source Project [Tue, 6 Nov 2012 20:23:56 +0000 (12:23 -0800)]
am
f9bac006: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
f9bac00620691f281df42d390517da2e37df8749':
Remove blank translation string from en-GB, so it can show English.
Manually enter translations for msgid:
9014073093293520112
Fix layout with no access points
Added info about why Wi-Fi is required
Show warnings when skipping Wi-Fi connection
Fix regression in Bluetooth settings.
Addressing issue where power control widget disappears issue
7205586
Fix NPE in DeviceInfoSettings
Fix a crash in InstalledAppDetails
Tweaking mechanism for adding keyguard widgets
Fix issue #
7178865: Selecting an app from Settings > Apps>...
Must initialize the new atomic..
Fix crash in Settings > Security
Wifi settings are in a different namespace now
Update Settings app to use new namespace for airplane-mode settings
The Android Open Source Project [Tue, 6 Nov 2012 20:18:44 +0000 (12:18 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ic248a0dc1baadcebad816f4870655a826fa7a5d7
The Android Automerger [Tue, 6 Nov 2012 10:29:12 +0000 (02:29 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Michael Jurka [Tue, 6 Nov 2012 02:56:14 +0000 (18:56 -0800)]
Supporting EXTRA_APPWIDGET_OPTIONS correctly
The Android Automerger [Tue, 6 Nov 2012 02:39:13 +0000 (18:39 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jim Miller [Mon, 5 Nov 2012 23:38:26 +0000 (15:38 -0800)]
am
95b2db64: am
fd34f989: Merge "Disable the "none" security selection in settings when there\'s only 1 user" into jb-mr1-lockscreen-dev
* commit '
95b2db64d4197883739e4b1be5ece409583ceb36':
Disable the "none" security selection in settings when there's only 1 user
Baligh Uddin [Mon, 5 Nov 2012 23:38:25 +0000 (15:38 -0800)]
am
7c99551a: am
18facce4: am
e3a4a5fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
7c99551aaca4f9f19c0d47d71ff6fc6a71a45ad2':
Baligh Uddin [Mon, 5 Nov 2012 23:38:24 +0000 (15:38 -0800)]
am
94c4b78a: am
ecfe5f0d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
94c4b78acb387aa926a3fbdf4efd7b14e8edc45e':
Import translations. DO NOT MERGE
Jim Miller [Mon, 5 Nov 2012 23:36:01 +0000 (15:36 -0800)]
am
fd34f989: Merge "Disable the "none" security selection in settings when there\'s only 1 user" into jb-mr1-lockscreen-dev
* commit '
fd34f989608dc02b0cdfbb7012c4c824a5107ded':
Disable the "none" security selection in settings when there's only 1 user
Baligh Uddin [Mon, 5 Nov 2012 23:36:00 +0000 (15:36 -0800)]
am
18facce4: am
e3a4a5fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
18facce4183adc1b058f9d04f3dfd3fe1e8fae2f':
Baligh Uddin [Mon, 5 Nov 2012 23:35:55 +0000 (15:35 -0800)]
am
ecfe5f0d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
ecfe5f0d4c31151ee8585ec5521ced2e6e6581b9':
Import translations. DO NOT MERGE
The Android Open Source Project [Mon, 5 Nov 2012 22:21:32 +0000 (14:21 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I3275f5314289403f5cd8e8accceec4f38404c7d1
Baligh Uddin [Mon, 5 Nov 2012 22:15:12 +0000 (14:15 -0800)]
am
50bfc55e: am
e3a4a5fd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
50bfc55e4190a2ffdadd9a9eb318e5c948ba7e66':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 5 Nov 2012 22:11:57 +0000 (14:11 -0800)]
am
e3a4a5fd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
e3a4a5fde5799fd6b26df146bec5e35bf3f856ba':
Import translations. DO NOT MERGE
Jim Miller [Mon, 5 Nov 2012 02:28:34 +0000 (18:28 -0800)]
Merge "Disable the "none" security selection in settings when there's only 1 user" into jb-mr1-lockscreen-dev
Baligh Uddin [Mon, 5 Nov 2012 01:53:05 +0000 (17:53 -0800)]
am
091c12c3: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
091c12c398143c6a128f5168f25e789150ffe6d6':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 5 Nov 2012 01:52:56 +0000 (17:52 -0800)]
am
e3a4a5fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
e3a4a5fde5799fd6b26df146bec5e35bf3f856ba':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 5 Nov 2012 01:51:14 +0000 (17:51 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Mon, 5 Nov 2012 01:50:58 +0000 (17:50 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Mon, 5 Nov 2012 01:50:45 +0000 (17:50 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
The Android Automerger [Sat, 3 Nov 2012 00:34:52 +0000 (17:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
OSDN Git Service
