OSDN Git Service
The Android Automerger [Mon, 18 Nov 2013 15:52:11 +0000 (07:52 -0800)]
merge in master-release history after reset to master
Baligh Uddin [Fri, 15 Nov 2013 20:03:39 +0000 (12:03 -0800)]
am
5569a8f4: am
9c8a463c: am
beb9a03b: Merge "Remove hardcoded msgid. We have already leveraged in TC." into klp-dev
* commit '
5569a8f48c742aa2aded408d0b3e8de7a0cba172':
Remove hardcoded msgid. We have already leveraged in TC.
Baligh Uddin [Fri, 15 Nov 2013 19:59:35 +0000 (11:59 -0800)]
am
9c8a463c: am
beb9a03b: Merge "Remove hardcoded msgid. We have already leveraged in TC." into klp-dev
* commit '
9c8a463c3005d8b3d96bde28ecc00a5b2788d9e3':
Remove hardcoded msgid. We have already leveraged in TC.
Baligh Uddin [Fri, 15 Nov 2013 19:56:55 +0000 (11:56 -0800)]
am
beb9a03b: Merge "Remove hardcoded msgid. We have already leveraged in TC." into klp-dev
* commit '
beb9a03b716d152ea25813fca3a93a1ec781a685':
Remove hardcoded msgid. We have already leveraged in TC.
Baligh Uddin [Fri, 15 Nov 2013 19:52:40 +0000 (19:52 +0000)]
Merge "Remove hardcoded msgid. We have already leveraged in TC." into klp-dev
Baligh Uddin [Fri, 15 Nov 2013 19:50:14 +0000 (11:50 -0800)]
am
5d3dd3a1: (-s ours) am
72d674af: (-s ours) am
ebf21489: (-s ours) Import translations. DO NOT MERGE
* commit '
5d3dd3a15a5399a0ce178022c45eaca848e34c7d':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:46:33 +0000 (11:46 -0800)]
am
72d674af: (-s ours) am
ebf21489: (-s ours) Import translations. DO NOT MERGE
* commit '
72d674af97df6f964f217ad7eddec7ea58612114':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:42:56 +0000 (11:42 -0800)]
am
ebf21489: (-s ours) Import translations. DO NOT MERGE
* commit '
ebf214892d020d9f310dd583e519bc3e1e8925cf':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:31:33 +0000 (11:31 -0800)]
Import translations. DO NOT MERGE
bug:
11696928
Change-Id: I500d2c96aef949f30d9fbabf2777563e9e68dbe6
Auto-generated-cl: translation import
Baligh Uddin [Fri, 15 Nov 2013 19:27:36 +0000 (19:27 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 15 Nov 2013 19:21:11 +0000 (11:21 -0800)]
Remove hardcoded msgid. We have already leveraged in TC.
bug:
11696928
Change-Id: I71beb961ff73902cf5a67c5de1175db30eaa0871
Baligh Uddin [Fri, 15 Nov 2013 19:19:15 +0000 (11:19 -0800)]
am
8f9d4e32: (-s ours) am
67a0472f: (-s ours) am
503b6def: (-s ours) Import translations. DO NOT MERGE
* commit '
8f9d4e323118fefcf418b6019eaeaf880b1d6d12':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:15:23 +0000 (11:15 -0800)]
am
67a0472f: (-s ours) am
503b6def: (-s ours) Import translations. DO NOT MERGE
* commit '
67a0472f3f53c924d180fdabe41bb26608219a83':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:11:55 +0000 (11:11 -0800)]
am
503b6def: (-s ours) Import translations. DO NOT MERGE
* commit '
503b6deff226b12450decd5997111c77bd179a88':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:08:07 +0000 (11:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7f948fb8948f8b0782a4a75dea963d6ba1481bd5
Auto-generated-cl: translation import
Baligh Uddin [Fri, 15 Nov 2013 19:04:19 +0000 (11:04 -0800)]
Import translations. DO NOT MERGE
Bug:
11696928
Change-Id: I23f78d9fb53fd5da325f121bac78ac60a9c78bb6
Auto-generated-cl: translation import
Svetoslav [Fri, 15 Nov 2013 06:34:13 +0000 (22:34 -0800)]
am
03360cd2: am
196bc5c6: am
e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev
* commit '
03360cd23910c73c78a822c559acb3eb66a8e07b':
Show correct message for a print job that is being canceled.
Svetoslav [Fri, 15 Nov 2013 06:30:53 +0000 (22:30 -0800)]
am
196bc5c6: am
e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev
* commit '
196bc5c63a3f08bc8dc972ee82f7fe98a453b8f5':
Show correct message for a print job that is being canceled.
Svetoslav [Fri, 15 Nov 2013 06:27:36 +0000 (22:27 -0800)]
am
e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev
* commit '
e7b781f574b8ec957d6254ed9edaef469c7085a5':
Show correct message for a print job that is being canceled.
Svetoslav [Fri, 15 Nov 2013 06:23:54 +0000 (06:23 +0000)]
Merge "Show correct message for a print job that is being canceled." into klp-dev
Lorenzo Colitti [Fri, 15 Nov 2013 05:09:47 +0000 (05:09 +0000)]
Merge "Dynamically update connectivity and IP address."
Lorenzo Colitti [Fri, 15 Nov 2013 05:06:58 +0000 (05:06 +0000)]
Merge "Cache preferences and services in status dialog."
Svetoslav [Fri, 15 Nov 2013 02:15:15 +0000 (18:15 -0800)]
Show correct message for a print job that is being canceled.
1. If a print job is being canceled we now show appropriate
message that matches what the notification shows.
2. If a print job is being canceled we do not show the cancel
button.
bug:
11696928
Change-Id: I0fc4f8226c4aa9acd6a4b65811f4228e56018315
Jeff Brown [Fri, 15 Nov 2013 01:37:31 +0000 (17:37 -0800)]
am
be6858e8: am
8174aad5: am
36f98428: Merge "Update cast screen strings." into klp-dev
* commit '
be6858e86f2bf89832e63a7a51663ac6cd13aab0':
Update cast screen strings.
Jeff Brown [Fri, 15 Nov 2013 01:35:01 +0000 (17:35 -0800)]
am
8174aad5: am
36f98428: Merge "Update cast screen strings." into klp-dev
* commit '
8174aad50382280c55a33f2572eb1fcdb53078c1':
Update cast screen strings.
Jeff Brown [Fri, 15 Nov 2013 01:31:33 +0000 (17:31 -0800)]
am
36f98428: Merge "Update cast screen strings." into klp-dev
* commit '
36f98428d450226670d67123ce02cc0c0ca75621':
Update cast screen strings.
Jeff Brown [Fri, 15 Nov 2013 01:29:05 +0000 (01:29 +0000)]
Merge "Update cast screen strings." into klp-dev
Jim Miller [Fri, 15 Nov 2013 00:33:12 +0000 (16:33 -0800)]
am
f75a736a: am
31ee7e19: am
fb3d5cad: Don\'t show keyguard on top of CryptKeeper
* commit '
f75a736a3e19385d7635a1c8b5f25f70d3b08dbc':
Don't show keyguard on top of CryptKeeper
Jim Miller [Fri, 15 Nov 2013 00:29:39 +0000 (16:29 -0800)]
am
31ee7e19: am
fb3d5cad: Don\'t show keyguard on top of CryptKeeper
* commit '
31ee7e19a040ab7660d39a6693f6ed38f7c961ad':
Don't show keyguard on top of CryptKeeper
Jim Miller [Fri, 15 Nov 2013 00:27:24 +0000 (16:27 -0800)]
am
fb3d5cad: Don\'t show keyguard on top of CryptKeeper
* commit '
fb3d5cad48876dbd366fd8b562529d355d2428db':
Don't show keyguard on top of CryptKeeper
Jeff Brown [Fri, 15 Nov 2013 00:04:13 +0000 (16:04 -0800)]
Update cast screen strings.
Bug:
11257292
Change-Id: I280f99bb91ebd0badd06b7fdca25aa3f2e96d201
Jim Miller [Thu, 14 Nov 2013 22:40:22 +0000 (14:40 -0800)]
Don't show keyguard on top of CryptKeeper
The fix in Change Ifbe4cdf40e3b76d2069ecace940f85fa58f31187 causes
keyguard to be more aggressive about showing itself.
CryptKeeper itself should explicitly dismiss keyguard.
Fixes bug
11680832
Change-Id: I87287762b73bdffc6f1800379f02f70f4bd873a8
David Christie [Thu, 14 Nov 2013 22:25:09 +0000 (14:25 -0800)]
am
9605791d: am
7ff9f2b4: am
b1ded62f: Merge "Update power widget icons and fix location behavior Bug:
11242129" into klp-dev
* commit '
9605791d4165435330979497191a6ac902762271':
Update power widget icons and fix location behavior Bug:
11242129
David Christie [Thu, 14 Nov 2013 22:20:31 +0000 (14:20 -0800)]
am
7ff9f2b4: am
b1ded62f: Merge "Update power widget icons and fix location behavior Bug:
11242129" into klp-dev
* commit '
7ff9f2b488e4017c7b3385fb067a14cfc07764fb':
Update power widget icons and fix location behavior Bug:
11242129
David Christie [Thu, 14 Nov 2013 20:16:06 +0000 (12:16 -0800)]
am
b1ded62f: Merge "Update power widget icons and fix location behavior Bug:
11242129" into klp-dev
* commit '
b1ded62f3fd8afa2507fc8d284522019dc1e31e2':
Update power widget icons and fix location behavior Bug:
11242129
David Christie [Thu, 14 Nov 2013 20:12:41 +0000 (20:12 +0000)]
Merge "Update power widget icons and fix location behavior Bug:
11242129" into klp-dev
Lorenzo Colitti [Fri, 6 Sep 2013 09:04:26 +0000 (18:04 +0900)]
Dynamically update connectivity and IP address.
The settings status page dynamically updates mobile network
status (in/out of service, signal strength, network type, etc.)
but not IP address and connectivity information. Dynamically
update that information as well, for consistency.
For consistency, also update the advanced wifi settings page.
Bug:
10232006
Change-Id: I3a292d8bd9e36ab16c37e107eefff4b37d884a4c
Lorenzo Colitti [Thu, 7 Nov 2013 18:53:29 +0000 (03:53 +0900)]
Cache preferences and services in status dialog.
Currently, the status dialog fetches the preferences and system
services that it uses to display connectivity information (e.g.,
IP and MAC addresses) only when the dialog is first opened. This
is fine because the connectivity information is only filled in
once and never updated.
In order to have this information update dynamically (like the
rest of the dialog), fetch and cache these objects in onCreate.
The next change will actually make this information update on
network changes.
Bug:
10232006
Change-Id: Ib4072674543e517cf6935e3e03f35090e728090a
Baligh Uddin [Thu, 14 Nov 2013 06:18:02 +0000 (22:18 -0800)]
am
94e1d51c: (-s ours) am
2f888a47: (-s ours) am
9b28d5a0: (-s ours) Import translations. DO NOT MERGE
* commit '
94e1d51c697484aca493c362bfef87ac3a24c611':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Nov 2013 02:37:13 +0000 (18:37 -0800)]
am
2f888a47: (-s ours) am
9b28d5a0: (-s ours) Import translations. DO NOT MERGE
* commit '
2f888a47522f8dcaad3f7ec32274675dd74c1501':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Nov 2013 02:33:06 +0000 (18:33 -0800)]
am
9b28d5a0: (-s ours) Import translations. DO NOT MERGE
* commit '
9b28d5a0c3a6ac46a55a5c8c3b10791494fd61c5':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Nov 2013 02:24:50 +0000 (02:24 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 14 Nov 2013 02:14:33 +0000 (18:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idcb80c7ffa297e2175e8d309aaa9e8845eeb0e12
Auto-generated-cl: translation import
Baligh Uddin [Thu, 14 Nov 2013 02:06:51 +0000 (18:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib1ee67aee616ec7f9c66191102dc2fbee9ef39de
Auto-generated-cl: translation import
Jeff Brown [Wed, 13 Nov 2013 17:05:55 +0000 (09:05 -0800)]
am
bf2f9612: am
3aedfdfd: am
81ed0438: Finalize assets for screen cast.
* commit '
bf2f96123fde3d1433ac18a072832b5f0f6a604f':
Finalize assets for screen cast.
Jeff Brown [Wed, 13 Nov 2013 17:02:20 +0000 (09:02 -0800)]
am
3aedfdfd: am
81ed0438: Finalize assets for screen cast.
* commit '
3aedfdfdbfcff15f6b761fca3b6bda8449f11053':
Finalize assets for screen cast.
Jeff Brown [Wed, 13 Nov 2013 16:57:58 +0000 (08:57 -0800)]
am
81ed0438: Finalize assets for screen cast.
* commit '
81ed043857dadcb69885c1e2ac37d63925c56c65':
Finalize assets for screen cast.
The Android Automerger [Wed, 13 Nov 2013 15:50:43 +0000 (07:50 -0800)]
merge in master-release history after reset to master
Jeff Brown [Wed, 13 Nov 2013 06:04:49 +0000 (22:04 -0800)]
Finalize assets for screen cast.
Bug:
11257292
Change-Id: I483496b4fc92bcf8e2c4f080a5a5d5bf97318b5d
Wei Wang [Wed, 13 Nov 2013 01:27:03 +0000 (17:27 -0800)]
Add ble settings strings.
Change-Id: If8685aac2f36f56a534f3ba47b1cc60fed88a8a3
The Android Automerger [Tue, 12 Nov 2013 15:50:35 +0000 (07:50 -0800)]
merge in master-release history after reset to master
Baligh Uddin [Tue, 12 Nov 2013 04:51:28 +0000 (20:51 -0800)]
am
5a04fb76: (-s ours) am
74a503fd: (-s ours) am
622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
5a04fb76dacbc6b0e030f726f4a03642a108b4dd':
Import translations. DO NOT MERGE
Jeff Brown [Tue, 12 Nov 2013 04:51:05 +0000 (20:51 -0800)]
am
0df39f39: am
2fba8be9: am
4e54c2a1: Integrate remote display routes into screen cast settings UI.
* commit '
0df39f39fcc45ff3efe92740ee46d7a762410b86':
Integrate remote display routes into screen cast settings UI.
Baligh Uddin [Mon, 11 Nov 2013 22:48:31 +0000 (14:48 -0800)]
am
74a503fd: (-s ours) am
622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
74a503fddf2626f6aedec486e9b30c4beb6377e2':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Nov 2013 22:44:42 +0000 (14:44 -0800)]
am
622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
622b5d2a6af0cda319e4fbe066d62e36b06f7aa3':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Nov 2013 22:41:12 +0000 (22:41 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 11 Nov 2013 18:40:56 +0000 (10:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4d3ae2840e2024de8eb5a15fbdab5f68123cb1c7
Auto-generated-cl: translation import
Baligh Uddin [Mon, 11 Nov 2013 18:35:06 +0000 (10:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icd51d4bde4dadc325ff26b08dece13e761a99430
Auto-generated-cl: translation import
Jeff Brown [Mon, 11 Nov 2013 18:27:24 +0000 (10:27 -0800)]
am
2fba8be9: am
4e54c2a1: Integrate remote display routes into screen cast settings UI.
* commit '
2fba8be9c0c9da814e40af00847f3f2d28cf7f01':
Integrate remote display routes into screen cast settings UI.
Jeff Brown [Mon, 11 Nov 2013 18:21:59 +0000 (10:21 -0800)]
am
4e54c2a1: Integrate remote display routes into screen cast settings UI.
* commit '
4e54c2a17765aed01ba23c9b0ec4d41e66c698b7':
Integrate remote display routes into screen cast settings UI.
The Android Automerger [Mon, 11 Nov 2013 15:51:17 +0000 (07:51 -0800)]
merge in master-release history after reset to master
Jeff Brown [Mon, 11 Nov 2013 05:02:20 +0000 (21:02 -0800)]
Integrate remote display routes into screen cast settings UI.
Merged remote display route selection into the existing wifi
display preference UI. Moved the on/off toggle over to a menu item.
The preference page is now mainly implemented in terms of the
media router. It only interacts with the display manager for the purpose
of pairing with new devices or making wifi display certification
controls available.
This means that the observed state is now completely consistent across
the system ui, settings, and applications that use the media router.
Bug:
11257292
Change-Id: I3705570812384fef4bfffeccaaccf7895d370d12
Ed Heyl [Fri, 8 Nov 2013 22:02:40 +0000 (14:02 -0800)]
am
f841589f: am
7ebe4c6c: am
a27816dc: merge in release branch changes (no-op).
* commit '
f841589f6a9b989e18716fac157d16b0d95f70a9':
Revert "Accessibility: filter touches to Enable button"
Ed Heyl [Fri, 8 Nov 2013 21:59:55 +0000 (13:59 -0800)]
am
7ebe4c6c: am
a27816dc: merge in release branch changes (no-op).
* commit '
7ebe4c6c209e983e648e2529d68ebe2c36bf7733':
Revert "Accessibility: filter touches to Enable button"
Ed Heyl [Fri, 8 Nov 2013 21:31:32 +0000 (13:31 -0800)]
am
a27816dc: merge in release branch changes (no-op).
* commit '
a27816dc2d72f5757ee5377ccd03798736c96fd8':
Revert "Accessibility: filter touches to Enable button"
Ed Heyl [Fri, 8 Nov 2013 21:23:52 +0000 (13:23 -0800)]
merge in release branch changes (no-op).
Robert Greenwalt [Thu, 7 Nov 2013 23:12:58 +0000 (15:12 -0800)]
am
6c20565d: am
384bf727: am
29b7a844: Merge "Add batch scan data to power stats." into klp-dev
* commit '
6c20565d97339751f22123a4b40893f2df7ea3ad':
Add batch scan data to power stats.
David Christie [Thu, 31 Oct 2013 18:03:36 +0000 (11:03 -0700)]
Update power widget icons and fix location behavior
Bug:
11242129
Change-Id: I29f5b4cf914ece4b0991229f384012eb66ba3820
Robert Greenwalt [Thu, 7 Nov 2013 18:43:11 +0000 (10:43 -0800)]
am
384bf727: am
29b7a844: Merge "Add batch scan data to power stats." into klp-dev
* commit '
384bf72708b623bf48a0395a51db94bda055f496':
Add batch scan data to power stats.
Robert Greenwalt [Thu, 7 Nov 2013 18:32:55 +0000 (10:32 -0800)]
am
29b7a844: Merge "Add batch scan data to power stats." into klp-dev
* commit '
29b7a8446a36286bd4311ec2f52281fd1628a86e':
Add batch scan data to power stats.
Robert Greenwalt [Thu, 7 Nov 2013 18:31:03 +0000 (18:31 +0000)]
Merge "Add batch scan data to power stats." into klp-dev
The Android Automerger [Thu, 7 Nov 2013 15:50:59 +0000 (07:50 -0800)]
merge in master-release history after reset to master
The Android Automerger [Thu, 7 Nov 2013 14:01:28 +0000 (06:01 -0800)]
merge in klp-mr1-release history after reset to klp-dev
Baligh Uddin [Thu, 7 Nov 2013 04:09:47 +0000 (20:09 -0800)]
am
233692b0: (-s ours) am
f9be657a: (-s ours) am
7d716436: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
233692b051050faf37931ac8013839de7785f0f2':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 7 Nov 2013 04:06:01 +0000 (20:06 -0800)]
am
f9be657a: (-s ours) am
7d716436: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f9be657ac28f2530938c24b09458defdbca07c4c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 7 Nov 2013 04:03:44 +0000 (20:03 -0800)]
am
7d716436: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
7d7164361e3e9cf9198fca4050fca81547053b04':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 7 Nov 2013 04:00:08 +0000 (04:00 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 7 Nov 2013 04:00:04 +0000 (04:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Kenny Root [Wed, 6 Nov 2013 23:17:49 +0000 (15:17 -0800)]
am
d0e1c273: am
279c1e15: am
d0de39e7: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev
* commit '
d0e1c273dbf9518b84a0a6f8bdcaa14f13246110':
Revert "Accessibility: filter touches to Enable button"
Kenny Root [Wed, 6 Nov 2013 23:14:35 +0000 (15:14 -0800)]
am
279c1e15: am
d0de39e7: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev
* commit '
279c1e15d23254728783ad99faff7349d9543ac4':
Revert "Accessibility: filter touches to Enable button"
Kenny Root [Wed, 6 Nov 2013 22:03:52 +0000 (22:03 +0000)]
Revert "Accessibility: filter touches to Enable button"
This reverts commit
94d4f23dccee1e27fdb360b1886327565b66aa91.
Change-Id: I26a77faed6798e5bf1d51048ffde4aa8b35aae2f
Kenny Root [Wed, 6 Nov 2013 23:11:14 +0000 (15:11 -0800)]
am
d0de39e7: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev
* commit '
d0de39e716c7d93beeb83f9b442af437be651e55':
Revert "Accessibility: filter touches to Enable button"
Kenny Root [Wed, 6 Nov 2013 23:09:05 +0000 (23:09 +0000)]
Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev
Baligh Uddin [Wed, 6 Nov 2013 22:39:01 +0000 (14:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: I802dcdf95e177ce98ade2553310f26fa04c843d3
Auto-generated-cl: translation import
Baligh Uddin [Wed, 6 Nov 2013 22:34:35 +0000 (14:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: I81129ec9d537a26df337e5f306b8897ce9fdc810
Auto-generated-cl: translation import
Kenny Root [Wed, 6 Nov 2013 22:03:52 +0000 (22:03 +0000)]
Revert "Accessibility: filter touches to Enable button"
This reverts commit
94d4f23dccee1e27fdb360b1886327565b66aa91.
Change-Id: I26a77faed6798e5bf1d51048ffde4aa8b35aae2f
Lifu Tang [Wed, 6 Nov 2013 16:51:56 +0000 (08:51 -0800)]
am
227043b5: am
5b68e4c8: am
741bc054: Merge "Shows LGAAYL when launching Location Settings" into klp-dev
* commit '
227043b55722b38cde8508011e2b1748e5ef66bc':
Shows LGAAYL when launching Location Settings
The Android Automerger [Wed, 6 Nov 2013 15:52:14 +0000 (07:52 -0800)]
merge in master-release history after reset to master
Lifu Tang [Wed, 6 Nov 2013 06:26:19 +0000 (22:26 -0800)]
am
5b68e4c8: am
741bc054: Merge "Shows LGAAYL when launching Location Settings" into klp-dev
* commit '
5b68e4c8d09d9c0cc864e32970c9af925dd0d643':
Shows LGAAYL when launching Location Settings
Lifu Tang [Wed, 6 Nov 2013 06:23:01 +0000 (22:23 -0800)]
am
741bc054: Merge "Shows LGAAYL when launching Location Settings" into klp-dev
* commit '
741bc054243576dcfff17bf3a807dc8732bca332':
Shows LGAAYL when launching Location Settings
Lifu Tang [Wed, 6 Nov 2013 06:20:56 +0000 (06:20 +0000)]
Merge "Shows LGAAYL when launching Location Settings" into klp-dev
Geoffrey Borggaard [Wed, 6 Nov 2013 02:59:12 +0000 (18:59 -0800)]
am
12a2c408: am
36ddea8c: am
5b7111d0: Merge "Remove line break." into klp-dev
* commit '
12a2c40871e2c9d965b0e9e1dbde5e00709f7b0a':
Remove line break.
Jason Monk [Wed, 6 Nov 2013 02:59:11 +0000 (18:59 -0800)]
am
58f53f9c: am
c85359ef: am
4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
* commit '
58f53f9c351329bf51bb548409c047e024d94fc4':
Add PAC UI to Wi-Fi Settings
Geoffrey Borggaard [Wed, 6 Nov 2013 02:56:59 +0000 (18:56 -0800)]
am
36ddea8c: am
5b7111d0: Merge "Remove line break." into klp-dev
* commit '
36ddea8c212b21dc24e270ce7d20023db1477a32':
Remove line break.
Jason Monk [Wed, 6 Nov 2013 02:56:49 +0000 (18:56 -0800)]
am
c85359ef: am
4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
* commit '
c85359ef11221c09e7a5d55692ffda0f98b8e00c':
Add PAC UI to Wi-Fi Settings
Geoffrey Borggaard [Wed, 6 Nov 2013 02:39:31 +0000 (18:39 -0800)]
am
5b7111d0: Merge "Remove line break." into klp-dev
* commit '
5b7111d05db50d479290517b1b459dbcfc178a7f':
Remove line break.
Geoffrey Borggaard [Wed, 6 Nov 2013 02:37:48 +0000 (02:37 +0000)]
Merge "Remove line break." into klp-dev
Jason Monk [Wed, 6 Nov 2013 02:22:58 +0000 (18:22 -0800)]
am
4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
* commit '
4e42c80872e3543247913afd270fe5b9950b2969':
Add PAC UI to Wi-Fi Settings
Jason Monk [Wed, 6 Nov 2013 02:20:49 +0000 (02:20 +0000)]
Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
Baligh Uddin [Tue, 5 Nov 2013 23:53:30 +0000 (15:53 -0800)]
am
9dddb8f5: (-s ours) am
e202393f: (-s ours) am
1bfd3541: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
9dddb8f58951adf9a1b6102b93e15349f69ed4c8':
Import translations. DO NOT MERGE
OSDN Git Service
