OSDN Git Service
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 18:42:43 +0000 (18:42 +0000)]
am
d1ce0ec8: am
bfb2dd48: am
2a26ac58: am
6da3f84c: am
7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
* commit '
d1ce0ec8cd42671b2127ae207c2b491a884f29ce':
Start PowerUsageDetails fragment in the correct activity
Alexandra Gherghina [Thu, 25 Sep 2014 18:42:41 +0000 (18:42 +0000)]
am
fe9fb062: am
9e9b5496: am
72cf0cf9: am
94e2341b: am
eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev
* commit '
fe9fb0625d7291d22fb84ac5a6db35d44024d2ae':
Add null check for sync authorities of an account type
Jeff Sharkey [Thu, 25 Sep 2014 18:42:38 +0000 (18:42 +0000)]
am
f3065166: am
390b0bae: am
8acdcf7a: am
a522e9a8: am
d642d1ab: Merge "Include reason when wiping data." into lmp-dev
* commit '
f3065166021cd8b63422508d2d0ec9e2ac283c73':
Include reason when wiping data.
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 18:32:32 +0000 (18:32 +0000)]
am
bfb2dd48: am
2a26ac58: am
6da3f84c: am
7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
* commit '
bfb2dd48cbc049c225c2b56cbe4fbe5b8b8bd0b9':
Start PowerUsageDetails fragment in the correct activity
Alexandra Gherghina [Thu, 25 Sep 2014 18:32:31 +0000 (18:32 +0000)]
am
9e9b5496: am
72cf0cf9: am
94e2341b: am
eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev
* commit '
9e9b54961d8e59bd89505dc8f20b337995cc2fcc':
Add null check for sync authorities of an account type
Jeff Sharkey [Thu, 25 Sep 2014 18:32:30 +0000 (18:32 +0000)]
am
390b0bae: am
8acdcf7a: am
a522e9a8: am
d642d1ab: Merge "Include reason when wiping data." into lmp-dev
* commit '
390b0bae5ddc0cf400d09193fea06e02630d8a41':
Include reason when wiping data.
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 16:57:51 +0000 (16:57 +0000)]
am
2a26ac58: am
6da3f84c: am
7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
* commit '
2a26ac58f025ea510800053b97aa39bef16091fa':
Start PowerUsageDetails fragment in the correct activity
Alexandra Gherghina [Thu, 25 Sep 2014 16:57:50 +0000 (16:57 +0000)]
am
72cf0cf9: am
94e2341b: am
eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev
* commit '
72cf0cf96d13054569f58109aaf6c0543af1d796':
Add null check for sync authorities of an account type
Jeff Sharkey [Thu, 25 Sep 2014 16:57:49 +0000 (16:57 +0000)]
am
8acdcf7a: am
a522e9a8: am
d642d1ab: Merge "Include reason when wiping data." into lmp-dev
* commit '
8acdcf7a522af8c4f21e1727ae82be516e34c113':
Include reason when wiping data.
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 16:39:16 +0000 (16:39 +0000)]
am
6da3f84c: am
7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
* commit '
6da3f84c9789378d701894a0a65be536da5e220c':
Start PowerUsageDetails fragment in the correct activity
Alexandra Gherghina [Thu, 25 Sep 2014 16:39:16 +0000 (16:39 +0000)]
am
94e2341b: am
eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev
* commit '
94e2341bb5557b405792d3040cc67ce24a965485':
Add null check for sync authorities of an account type
Jeff Sharkey [Thu, 25 Sep 2014 16:39:15 +0000 (16:39 +0000)]
am
a522e9a8: am
d642d1ab: Merge "Include reason when wiping data." into lmp-dev
* commit '
a522e9a83739446bf89d801f7ceac5f7effc3727':
Include reason when wiping data.
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 16:24:17 +0000 (16:24 +0000)]
am
7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
* commit '
7258650efdea447dea6f2f557cb9d2b90df92754':
Start PowerUsageDetails fragment in the correct activity
Alexandra Gherghina [Thu, 25 Sep 2014 16:24:15 +0000 (16:24 +0000)]
am
eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev
* commit '
eac7cc5eead6d79fb6e0558d8005b4c8ea1911a1':
Add null check for sync authorities of an account type
Jeff Sharkey [Thu, 25 Sep 2014 16:22:25 +0000 (16:22 +0000)]
am
d642d1ab: Merge "Include reason when wiping data." into lmp-dev
* commit '
d642d1abcfed427e4c152e28e39b50cdb68b81c6':
Include reason when wiping data.
Zoltan Szatmary-Ban [Thu, 25 Sep 2014 10:35:57 +0000 (10:35 +0000)]
Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
Paul Lawrence [Thu, 25 Sep 2014 10:35:01 +0000 (10:35 +0000)]
am
d54a2e05: am
1bbaf081: am
f295f01b: am
2c4de435: am
29df3796: Merge "Hide controls once password is known good" into lmp-dev
* commit '
d54a2e0506de833b3461a649d217a478f4046b4d':
Hide controls once password is known good
Paul Lawrence [Thu, 25 Sep 2014 10:24:13 +0000 (10:24 +0000)]
am
1bbaf081: am
f295f01b: am
2c4de435: am
29df3796: Merge "Hide controls once password is known good" into lmp-dev
* commit '
1bbaf081363e04506896965192c1d316c2e22ab6':
Hide controls once password is known good
Paul Lawrence [Thu, 25 Sep 2014 10:14:08 +0000 (10:14 +0000)]
am
f295f01b: am
2c4de435: am
29df3796: Merge "Hide controls once password is known good" into lmp-dev
* commit '
f295f01bcc7200d46d24893392ce9522ace3928c':
Hide controls once password is known good
Paul Lawrence [Thu, 25 Sep 2014 10:03:46 +0000 (10:03 +0000)]
am
2c4de435: am
29df3796: Merge "Hide controls once password is known good" into lmp-dev
* commit '
2c4de435bf4dfb339fe7b36ab0f9ac93ed8120ce':
Hide controls once password is known good
Paul Lawrence [Thu, 25 Sep 2014 09:51:35 +0000 (09:51 +0000)]
am
29df3796: Merge "Hide controls once password is known good" into lmp-dev
* commit '
29df37969794aa4db73af0d0fdbcde273aef5ab2':
Hide controls once password is known good
Alexandra Gherghina [Thu, 25 Sep 2014 09:37:57 +0000 (09:37 +0000)]
Merge "Add null check for sync authorities of an account type" into lmp-dev
Jeff Sharkey [Wed, 24 Sep 2014 23:28:00 +0000 (23:28 +0000)]
Merge "Include reason when wiping data." into lmp-dev
Paul Lawrence [Wed, 24 Sep 2014 22:59:07 +0000 (22:59 +0000)]
Merge "Hide controls once password is known good" into lmp-dev
Jeff Sharkey [Wed, 24 Sep 2014 20:57:07 +0000 (13:57 -0700)]
Include reason when wiping data.
This will help us track down who requested a data wipe.
Bug:
17412160
Change-Id: I46b3f12a661a406450d23a7974513f40beb23c8d
Adrian Roos [Wed, 24 Sep 2014 17:56:35 +0000 (17:56 +0000)]
am
b88b3ea8: am
ec93c7b0: am
ed595302: am
c45bfc9a: am
6d5c75f6: Prevent saving credentials multiple times
* commit '
b88b3ea88b490291c684ecc11c923032f4d755a9':
Prevent saving credentials multiple times
Adrian Roos [Wed, 24 Sep 2014 17:43:22 +0000 (17:43 +0000)]
am
ec93c7b0: am
ed595302: am
c45bfc9a: am
6d5c75f6: Prevent saving credentials multiple times
* commit '
ec93c7b071ff36051a89e8ac339f4e76f3c9e26b':
Prevent saving credentials multiple times
Adrian Roos [Wed, 24 Sep 2014 17:36:58 +0000 (17:36 +0000)]
am
ed595302: am
c45bfc9a: am
6d5c75f6: Prevent saving credentials multiple times
* commit '
ed5953026910534857ffd7169b1e4da13f5b6588':
Prevent saving credentials multiple times
Adrian Roos [Wed, 24 Sep 2014 17:24:14 +0000 (17:24 +0000)]
am
c45bfc9a: am
6d5c75f6: Prevent saving credentials multiple times
* commit '
c45bfc9a3cb46af2fadd8e400d8a691108b94be1':
Prevent saving credentials multiple times
Alan Viverette [Wed, 24 Sep 2014 17:17:06 +0000 (17:17 +0000)]
am
f1f7af01: am
05df9029: am
e4031966: am
6f6e547e: am
3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev
* commit '
f1f7af01deb8e5c2bfd102ed4455e2d3d59c8e72':
Fix background colors to point directly to theme attribute
Fabrice Di Meglio [Wed, 24 Sep 2014 17:17:05 +0000 (17:17 +0000)]
am
bd5d45a4: am
4f392ba8: am
d1f70635: am
b749fd3d: am
a1c6a0c8: Merge "Fix bug #
17594602 Battery Usage refresh icon needs updating" into lmp-dev
* commit '
bd5d45a486c80b7ae2d543b8f0bb3d6f0c460451':
Fix bug #
17594602 Battery Usage refresh icon needs updating
vandwalle [Wed, 24 Sep 2014 17:16:31 +0000 (17:16 +0000)]
am
92cc8dbb: am
6767666d: am
333f5b85: am
0b5aedc2: am
3962f171: Merge "correctly report DHCP failures" into lmp-dev
* commit '
92cc8dbb739d5e396a1e2bcecead834f4966b5d6':
correctly report DHCP failures
Adrian Roos [Wed, 24 Sep 2014 17:11:42 +0000 (17:11 +0000)]
am
6d5c75f6: Prevent saving credentials multiple times
* commit '
6d5c75f6cd928befb348fa283e53edc10716f151':
Prevent saving credentials multiple times
Adrian Roos [Wed, 24 Sep 2014 13:28:12 +0000 (15:28 +0200)]
Prevent saving credentials multiple times
Bug:
17610563
Change-Id: Ibb51889fc8085f8fad5e36481af2419576cda34a
Alexandra Gherghina [Wed, 24 Sep 2014 10:29:48 +0000 (11:29 +0100)]
Add null check for sync authorities of an account type
This protects against a potential NPE if there are no sync authorities for
an account of a given type.
Bug:
17612697
Change-Id: Ifd34b5b7692cbcc8de78d353eedd284e499f954e
Zoltan Szatmary-Ban [Mon, 22 Sep 2014 16:14:08 +0000 (17:14 +0100)]
Start PowerUsageDetails fragment in the correct activity
Make sure the stack does not get corrupted by running a fragment as a
managed profile in an activity that runs as primary profile.
Bug:
17523189
Change-Id: I7a066a411c7995ffe44b73c6dc27b24eec85b5b3
Alan Viverette [Wed, 24 Sep 2014 04:13:11 +0000 (04:13 +0000)]
am
05df9029: am
e4031966: am
6f6e547e: am
3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev
* commit '
05df9029e951816888b06599dd7320de9362f038':
Fix background colors to point directly to theme attribute
Fabrice Di Meglio [Wed, 24 Sep 2014 04:13:10 +0000 (04:13 +0000)]
am
4f392ba8: am
d1f70635: am
b749fd3d: am
a1c6a0c8: Merge "Fix bug #
17594602 Battery Usage refresh icon needs updating" into lmp-dev
* commit '
4f392ba82fd0a07ae3bb2662e2fa6253798dae6f':
Fix bug #
17594602 Battery Usage refresh icon needs updating
Alan Viverette [Wed, 24 Sep 2014 03:57:42 +0000 (03:57 +0000)]
am
e4031966: am
6f6e547e: am
3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev
* commit '
e4031966eb90c1b457bf92ca353676877b9ef8e2':
Fix background colors to point directly to theme attribute
Fabrice Di Meglio [Wed, 24 Sep 2014 03:57:41 +0000 (03:57 +0000)]
am
d1f70635: am
b749fd3d: am
a1c6a0c8: Merge "Fix bug #
17594602 Battery Usage refresh icon needs updating" into lmp-dev
* commit '
d1f7063532e004e235b98a719d619e1e68d5c7bf':
Fix bug #
17594602 Battery Usage refresh icon needs updating
Alan Viverette [Wed, 24 Sep 2014 03:29:41 +0000 (03:29 +0000)]
am
6f6e547e: am
3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev
* commit '
6f6e547e6ad93eb21599e721526909273e6d4fef':
Fix background colors to point directly to theme attribute
Fabrice Di Meglio [Wed, 24 Sep 2014 03:24:58 +0000 (03:24 +0000)]
am
b749fd3d: am
a1c6a0c8: Merge "Fix bug #
17594602 Battery Usage refresh icon needs updating" into lmp-dev
* commit '
b749fd3d298c72b3377a6bcfd081d3739f40bcf9':
Fix bug #
17594602 Battery Usage refresh icon needs updating
Alan Viverette [Wed, 24 Sep 2014 01:34:44 +0000 (01:34 +0000)]
am
3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev
* commit '
3156e38f5ec788048439a401ea5f5012e11ea2a7':
Fix background colors to point directly to theme attribute
Alan Viverette [Wed, 24 Sep 2014 01:25:06 +0000 (01:25 +0000)]
Merge "Fix background colors to point directly to theme attribute" into lmp-dev
Alan Viverette [Wed, 24 Sep 2014 01:14:54 +0000 (18:14 -0700)]
Fix background colors to point directly to theme attribute
BUG:
17520824
Change-Id: I77fcbc2a5535f4916053cf1668cbe2e432b2dc95
Fabrice Di Meglio [Wed, 24 Sep 2014 00:05:54 +0000 (00:05 +0000)]
am
a1c6a0c8: Merge "Fix bug #
17594602 Battery Usage refresh icon needs updating" into lmp-dev
* commit '
a1c6a0c895f6d580bebfb714c7930f5ec015770d':
Fix bug #
17594602 Battery Usage refresh icon needs updating
Fabrice Di Meglio [Tue, 23 Sep 2014 23:58:57 +0000 (23:58 +0000)]
Merge "Fix bug #
17594602 Battery Usage refresh icon needs updating" into lmp-dev
vandwalle [Tue, 23 Sep 2014 23:18:20 +0000 (23:18 +0000)]
am
6767666d: am
333f5b85: am
0b5aedc2: am
3962f171: Merge "correctly report DHCP failures" into lmp-dev
* commit '
6767666d25005cdd0ad4fb962b182fdf13a10848':
correctly report DHCP failures
Fabrice Di Meglio [Tue, 23 Sep 2014 23:17:00 +0000 (16:17 -0700)]
Fix bug #
17594602 Battery Usage refresh icon needs updating
- use the correct Framework asset for "refresh"
Change-Id: I57d55c0646fb3a8693cf5cc51a4c7fa213873385
vandwalle [Tue, 23 Sep 2014 23:05:58 +0000 (23:05 +0000)]
am
333f5b85: am
0b5aedc2: am
3962f171: Merge "correctly report DHCP failures" into lmp-dev
* commit '
333f5b857666565ba89f6197fd253fd9c9c9b7da':
correctly report DHCP failures
vandwalle [Tue, 23 Sep 2014 22:57:59 +0000 (22:57 +0000)]
am
0b5aedc2: am
3962f171: Merge "correctly report DHCP failures" into lmp-dev
* commit '
0b5aedc2c560be1af7344e9a7ecacd85ab2cd0c0':
correctly report DHCP failures
vandwalle [Tue, 23 Sep 2014 22:41:31 +0000 (22:41 +0000)]
am
3962f171: Merge "correctly report DHCP failures" into lmp-dev
* commit '
3962f171a9a44adea57618c5ac9bf4a47342c0b6':
correctly report DHCP failures
vandwalle [Tue, 23 Sep 2014 22:31:55 +0000 (22:31 +0000)]
Merge "correctly report DHCP failures" into lmp-dev
Fabrice Di Meglio [Tue, 23 Sep 2014 21:13:22 +0000 (21:13 +0000)]
am
ef2a7137: am
6fd07d23: am
615a9f68: am
8a966a45: am
575a4d2a: Merge "Fix bug #
17624121 Settings crash while launching on wiped device" into lmp-dev
* commit '
ef2a7137d31631d80721c46a9f149868e7300de9':
Fix bug #
17624121 Settings crash while launching on wiped device
Fabrice Di Meglio [Tue, 23 Sep 2014 21:00:48 +0000 (21:00 +0000)]
am
6fd07d23: am
615a9f68: am
8a966a45: am
575a4d2a: Merge "Fix bug #
17624121 Settings crash while launching on wiped device" into lmp-dev
* commit '
6fd07d2382d04e30a9120d024f83601174aa5b23':
Fix bug #
17624121 Settings crash while launching on wiped device
Fabrice Di Meglio [Tue, 23 Sep 2014 20:48:44 +0000 (20:48 +0000)]
am
615a9f68: am
8a966a45: am
575a4d2a: Merge "Fix bug #
17624121 Settings crash while launching on wiped device" into lmp-dev
* commit '
615a9f68fb85f09944d7e98dc0e00ec7ed558712':
Fix bug #
17624121 Settings crash while launching on wiped device
Fabrice Di Meglio [Tue, 23 Sep 2014 20:38:12 +0000 (20:38 +0000)]
am
8a966a45: am
575a4d2a: Merge "Fix bug #
17624121 Settings crash while launching on wiped device" into lmp-dev
* commit '
8a966a452d4ce8b2251a6e9607c64ab56a5d3d1e':
Fix bug #
17624121 Settings crash while launching on wiped device
Fabrice Di Meglio [Tue, 23 Sep 2014 20:27:19 +0000 (20:27 +0000)]
am
575a4d2a: Merge "Fix bug #
17624121 Settings crash while launching on wiped device" into lmp-dev
* commit '
575a4d2a19e0d3e3b052c936ce973d30c8b63be6':
Fix bug #
17624121 Settings crash while launching on wiped device
Fabrice Di Meglio [Tue, 23 Sep 2014 20:16:22 +0000 (20:16 +0000)]
Merge "Fix bug #
17624121 Settings crash while launching on wiped device" into lmp-dev
vandwalle [Thu, 18 Sep 2014 22:39:23 +0000 (15:39 -0700)]
correctly report DHCP failures
Change-Id: I7a77da83dfb91d42ae18c54ae369ee8756e8f4d6
PauloftheWest [Tue, 23 Sep 2014 19:06:44 +0000 (19:06 +0000)]
am
c501efb0: am
b28cfb20: am
7f397ef5: am
a205445b: am
3b04714b: Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev
* commit '
c501efb09a0486f49e3c1b54967be7ca638c75a2':
Fixed a Settings crash when exiting Wi-Fi Settings.
John Spurlock [Tue, 23 Sep 2014 19:06:42 +0000 (19:06 +0000)]
am
2c383942: am
a7fb5fbc: am
7d085d6d: am
65a7bc64: am
7e905488: Settings: Wire up new zen events config option.
* commit '
2c383942b3fbda90e390cf8975fd3de32a0c007e':
Settings: Wire up new zen events config option.
Fabrice Di Meglio [Tue, 23 Sep 2014 18:36:44 +0000 (11:36 -0700)]
Fix bug #
17624121 Settings crash while launching on wiped device
- check for non null reference returned by NfcAdapter.getDefaultAdapter(this)
Change-Id: I88776dbefd351ce1c77cfed6d14b8b2143294488
Baligh Uddin [Tue, 23 Sep 2014 16:17:52 +0000 (16:17 +0000)]
am
76fbe05a: (-s ours) am
349a3eff: (-s ours) am
667eb931: (-s ours) am
f3bea4dd: (-s ours) am
2bfd4a5f: (-s ours) Import translations. DO NOT MERGE
* commit '
76fbe05a6e8acd36775fc7798dc4528ce0dc1fea':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Sep 2014 16:17:51 +0000 (16:17 +0000)]
am
a8b14e83: (-s ours) am
19a41682: (-s ours) am
165e3db3: (-s ours) am
b4d0d4da: (-s ours) Import translations. DO NOT MERGE
* commit '
a8b14e83925446a52635a97ff1df50c418cf332a':
Import translations. DO NOT MERGE
PauloftheWest [Tue, 23 Sep 2014 15:53:23 +0000 (15:53 +0000)]
am
b28cfb20: am
7f397ef5: am
a205445b: am
3b04714b: Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev
* commit '
b28cfb2001182a99f6177e16ae241563159503b5':
Fixed a Settings crash when exiting Wi-Fi Settings.
John Spurlock [Tue, 23 Sep 2014 15:48:31 +0000 (15:48 +0000)]
am
a7fb5fbc: am
7d085d6d: am
65a7bc64: am
7e905488: Settings: Wire up new zen events config option.
* commit '
a7fb5fbc7b35ba905d84362582bdf67d53ad5d40':
Settings: Wire up new zen events config option.
PauloftheWest [Tue, 23 Sep 2014 13:27:37 +0000 (13:27 +0000)]
am
7f397ef5: am
a205445b: am
3b04714b: Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev
* commit '
7f397ef5cc28f21680d0ed2872aeda14c70c6623':
Fixed a Settings crash when exiting Wi-Fi Settings.
PauloftheWest [Tue, 23 Sep 2014 13:16:16 +0000 (13:16 +0000)]
am
a205445b: am
3b04714b: Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev
* commit '
a205445be28f4c0b0f972344c99d7158c1cc5c2e':
Fixed a Settings crash when exiting Wi-Fi Settings.
PauloftheWest [Tue, 23 Sep 2014 13:05:53 +0000 (13:05 +0000)]
am
3b04714b: Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev
* commit '
3b04714bdf970eaad831edb3531253c87aced2bc':
Fixed a Settings crash when exiting Wi-Fi Settings.
PauloftheWest [Tue, 23 Sep 2014 13:00:01 +0000 (13:00 +0000)]
Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev
PauloftheWest [Mon, 22 Sep 2014 16:26:05 +0000 (09:26 -0700)]
Fixed a Settings crash when exiting Wi-Fi Settings.
Bug:
17600287
Change-Id: Id2d35e450798785db8e485972036483946f67ef3
John Spurlock [Mon, 22 Sep 2014 21:44:22 +0000 (21:44 +0000)]
am
7d085d6d: am
65a7bc64: am
7e905488: Settings: Wire up new zen events config option.
* commit '
7d085d6de5c8a75afe4d68bc91cc9e1e3a4bc483':
Settings: Wire up new zen events config option.
John Spurlock [Mon, 22 Sep 2014 21:32:28 +0000 (21:32 +0000)]
am
65a7bc64: am
7e905488: Settings: Wire up new zen events config option.
* commit '
65a7bc6449c598cb5ea10e0899f1885339563424':
Settings: Wire up new zen events config option.
John Spurlock [Mon, 22 Sep 2014 21:21:04 +0000 (21:21 +0000)]
am
7e905488: Settings: Wire up new zen events config option.
* commit '
7e90548836b3e7c4ec8132d9965ba11f055f6931':
Settings: Wire up new zen events config option.
John Spurlock [Fri, 19 Sep 2014 19:31:12 +0000 (15:31 -0400)]
Settings: Wire up new zen events config option.
Add a new switch to zen mode settings for the new
events config attribute.
Depends on frameworks/base:
Iff10df385206ad73c3423ff118c79e94a10918d9
Bug:
17580878
Change-Id: Ib6c74a871aa02f9379dce58dd5bca817dcd3929a
Baligh Uddin [Mon, 22 Sep 2014 20:01:03 +0000 (20:01 +0000)]
am
349a3eff: (-s ours) am
667eb931: (-s ours) am
f3bea4dd: (-s ours) am
2bfd4a5f: (-s ours) Import translations. DO NOT MERGE
* commit '
349a3eff415f1f3c19c4332bd3b7d8b80fa298a2':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Sep 2014 20:01:02 +0000 (20:01 +0000)]
am
19a41682: (-s ours) am
165e3db3: (-s ours) am
b4d0d4da: (-s ours) Import translations. DO NOT MERGE
* commit '
19a416826d73ea4ec1cd26ac61a2b9d074714065':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Sep 2014 19:38:18 +0000 (19:38 +0000)]
am
667eb931: (-s ours) am
f3bea4dd: (-s ours) am
2bfd4a5f: (-s ours) Import translations. DO NOT MERGE
* commit '
667eb931552d6cafeb26f064655f8c4f4ebf09f7':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Sep 2014 19:38:16 +0000 (19:38 +0000)]
am
165e3db3: (-s ours) am
b4d0d4da: (-s ours) Import translations. DO NOT MERGE
* commit '
165e3db3366290c1397ea753c69f46d6730cd4bc':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Sep 2014 19:18:38 +0000 (19:18 +0000)]
am
f3bea4dd: (-s ours) am
2bfd4a5f: (-s ours) Import translations. DO NOT MERGE
* commit '
f3bea4ddd76485014626d7997a0ecbcc5f36217c':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Sep 2014 19:18:30 +0000 (19:18 +0000)]
am
b4d0d4da: (-s ours) Import translations. DO NOT MERGE
* commit '
b4d0d4da2e6a2d0fa28b6471b088eeabc80b8f5f':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 21 Sep 2014 18:38:25 +0000 (18:38 +0000)]
am
50a3d405: (-s ours) am
3e8cec75: (-s ours) am
9ca34e9a: (-s ours) Import translations. DO NOT MERGE
* commit '
50a3d40558a33c1bfe34852346fb9582f8fb98d6':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 21 Sep 2014 18:34:17 +0000 (18:34 +0000)]
am
c815ddc2: (-s ours) am
9d4f29d2: (-s ours) Import translations. DO NOT MERGE
* commit '
c815ddc21715e4a6328bd5ce2b89725653d7475a':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 21 Sep 2014 18:30:27 +0000 (18:30 +0000)]
am
3e8cec75: (-s ours) am
9ca34e9a: (-s ours) Import translations. DO NOT MERGE
* commit '
3e8cec75288a91a566f4957e33122223877a7011':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 21 Sep 2014 18:19:46 +0000 (18:19 +0000)]
am
9ca34e9a: (-s ours) Import translations. DO NOT MERGE
* commit '
9ca34e9ad63271958d453d5126ce6edf0e501483':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 21 Sep 2014 18:19:31 +0000 (18:19 +0000)]
am
2bfd4a5f: (-s ours) Import translations. DO NOT MERGE
* commit '
2bfd4a5f2cb7e92331f9a4f44f1b70105cc2cb79':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 21 Sep 2014 18:16:51 +0000 (18:16 +0000)]
am
9d4f29d2: (-s ours) Import translations. DO NOT MERGE
* commit '
9d4f29d207fb147dbc16fd0fadc4ed5edc08abd3':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 21 Sep 2014 06:45:37 +0000 (23:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1129b9bf0472d9d37a476c44fdf981b01e29f7b3
Auto-generated-cl: translation import
Baligh Uddin [Sun, 21 Sep 2014 06:34:37 +0000 (23:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic065056673757eb2cc68d1102d5e480418e7cc47
Auto-generated-cl: translation import
Baligh Uddin [Sun, 21 Sep 2014 06:31:22 +0000 (23:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I318c0e8a24903330e142059ab9d41b2dd13e39d1
Auto-generated-cl: translation import
Baligh Uddin [Sun, 21 Sep 2014 06:28:12 +0000 (23:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I03201beb1e3307a852bef4cdae23e6d313588e0b
Auto-generated-cl: translation import
Baligh Uddin [Sun, 21 Sep 2014 06:24:41 +0000 (23:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I628b5768f52d634b8ce2a08b1fee5f07de7a8b68
Auto-generated-cl: translation import
PauloftheWest [Sat, 20 Sep 2014 00:38:27 +0000 (00:38 +0000)]
am
c8648718: am
934af544: am
04301e3d: am
3845f270: am
27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev
* commit '
c8648718db9c05482579a46e48907851849b1670':
Fixed a Bluetooth discovery bug.
PauloftheWest [Sat, 20 Sep 2014 00:38:26 +0000 (00:38 +0000)]
am
a0f49568: am
f5f3596c: am
e9a8b3df: am
1f604d5b: am
1977342e: Merge "Fixed Settings Cellular Networks crash." into lmp-dev
* commit '
a0f49568b63f7daba34268d495bbf5f7696df545':
Fixed Settings Cellular Networks crash.
PauloftheWest [Sat, 20 Sep 2014 00:27:33 +0000 (00:27 +0000)]
am
934af544: am
04301e3d: am
3845f270: am
27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev
* commit '
934af5444c6957ab476098bf3fb95789942ed51f':
Fixed a Bluetooth discovery bug.
PauloftheWest [Sat, 20 Sep 2014 00:27:32 +0000 (00:27 +0000)]
am
f5f3596c: am
e9a8b3df: am
1f604d5b: am
1977342e: Merge "Fixed Settings Cellular Networks crash." into lmp-dev
* commit '
f5f3596c89149013dcc565dbf6d19514faf240b3':
Fixed Settings Cellular Networks crash.
PauloftheWest [Sat, 20 Sep 2014 00:13:33 +0000 (00:13 +0000)]
am
04301e3d: am
3845f270: am
27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev
* commit '
04301e3d9b1b8dc0b21b97d01856474fa10990d5':
Fixed a Bluetooth discovery bug.
PauloftheWest [Sat, 20 Sep 2014 00:13:32 +0000 (00:13 +0000)]
am
e9a8b3df: am
1f604d5b: am
1977342e: Merge "Fixed Settings Cellular Networks crash." into lmp-dev
* commit '
e9a8b3df7d9050517b29aa7bb57f92adc833ea7b':
Fixed Settings Cellular Networks crash.
PauloftheWest [Sat, 20 Sep 2014 00:00:54 +0000 (00:00 +0000)]
am
3845f270: am
27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev
* commit '
3845f270ff1c51611cc14b524878ae6c83e41590':
Fixed a Bluetooth discovery bug.
OSDN Git Service
