OSDN Git Service
Billy Lau [Sat, 8 Aug 2015 02:49:48 +0000 (02:49 +0000)]
am
c2012bb4: am
16dc289d: am
8c26cbd8: am
5b2c66e4: am
a59f39fc: Merge "Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
* commit '
c2012bb4792299d16ea1c55c40ad18cdfad9a134':
Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
Dianne Hackborn [Sat, 8 Aug 2015 02:49:34 +0000 (02:49 +0000)]
am
81a3ef13: am
a3e66576: am
1ded4413: am
7a3a4533: am
e7a5966a: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
81a3ef139b3f607562b784430fe2748f3eff9713':
Fix issue #
23037720: New Battery Optimization Strings
Billy Lau [Fri, 7 Aug 2015 22:42:55 +0000 (22:42 +0000)]
am
16dc289d: am
8c26cbd8: am
5b2c66e4: am
a59f39fc: Merge "Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
* commit '
16dc289d5b29ecccf02fc86349ab53cbc10e6b11':
Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
Billy Lau [Fri, 7 Aug 2015 22:36:29 +0000 (22:36 +0000)]
am
8c26cbd8: am
5b2c66e4: am
a59f39fc: Merge "Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
* commit '
8c26cbd87e8fe5880f84c5a27c89176e045f6669':
Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
Billy Lau [Fri, 7 Aug 2015 22:28:38 +0000 (22:28 +0000)]
am
5b2c66e4: am
a59f39fc: Merge "Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
* commit '
5b2c66e4da749ca59d09776ec7831e20d1211909':
Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
Dianne Hackborn [Fri, 7 Aug 2015 22:25:36 +0000 (22:25 +0000)]
am
a3e66576: am
1ded4413: am
7a3a4533: am
e7a5966a: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
a3e665765882c7919d8d41dc5caa42d1e17b6044':
Fix issue #
23037720: New Battery Optimization Strings
Billy Lau [Fri, 7 Aug 2015 22:22:19 +0000 (22:22 +0000)]
am
a59f39fc: Merge "Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
* commit '
a59f39fca65d0828b0e4ade95a8404282e858ba9':
Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
Dianne Hackborn [Fri, 7 Aug 2015 22:20:50 +0000 (22:20 +0000)]
am
1ded4413: am
7a3a4533: am
e7a5966a: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
1ded441390e79dc46d576dadbbf1a69da12d399d':
Fix issue #
23037720: New Battery Optimization Strings
Billy Lau [Fri, 7 Aug 2015 22:15:32 +0000 (22:15 +0000)]
Merge "Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
Dianne Hackborn [Fri, 7 Aug 2015 22:12:58 +0000 (22:12 +0000)]
am
7a3a4533: am
e7a5966a: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
7a3a453349fb51043d84adc21f87472ba34c49a8':
Fix issue #
23037720: New Battery Optimization Strings
Dianne Hackborn [Fri, 7 Aug 2015 22:05:56 +0000 (22:05 +0000)]
am
e7a5966a: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
e7a5966aa72a7a64358e4092fa3fe2b46b28c420':
Fix issue #
23037720: New Battery Optimization Strings
Dianne Hackborn [Fri, 7 Aug 2015 21:58:52 +0000 (21:58 +0000)]
Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
Dianne Hackborn [Fri, 7 Aug 2015 21:38:06 +0000 (14:38 -0700)]
Fix issue #
23037720: New Battery Optimization Strings
Thar be strings.
Change-Id: Ieb43d041912cc5d2cc181d3232e01dbfce6cbc0e
Julia Reynolds [Fri, 7 Aug 2015 17:04:24 +0000 (17:04 +0000)]
am
af3414c2: am
559a3e78: am
e113f0c4: am
b7028f25: am
5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
* commit '
af3414c2c759f07d3febb89cd161bac4f91ce21a':
Hide optimization control on battery details page for non whitelisted apps.
Julia Reynolds [Fri, 7 Aug 2015 16:57:50 +0000 (16:57 +0000)]
am
559a3e78: am
e113f0c4: am
b7028f25: am
5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
* commit '
559a3e788652d448c2c95e2c024cf9f444258ca7':
Hide optimization control on battery details page for non whitelisted apps.
Julia Reynolds [Fri, 7 Aug 2015 16:52:11 +0000 (16:52 +0000)]
am
e113f0c4: am
b7028f25: am
5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
* commit '
e113f0c4876b7529170768f8c7cf99f218d48ca8':
Hide optimization control on battery details page for non whitelisted apps.
Julia Reynolds [Fri, 7 Aug 2015 16:45:04 +0000 (16:45 +0000)]
am
b7028f25: am
5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
* commit '
b7028f254de1f7fdda5c3ee248f2e5a9294cc4dd':
Hide optimization control on battery details page for non whitelisted apps.
Julia Reynolds [Fri, 7 Aug 2015 16:34:58 +0000 (16:34 +0000)]
am
5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
* commit '
5ab0e183abdd4008c5591011804d0bc770851a7f':
Hide optimization control on battery details page for non whitelisted apps.
Julia Reynolds [Fri, 7 Aug 2015 16:29:41 +0000 (16:29 +0000)]
Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
Geoff Mendal [Fri, 7 Aug 2015 06:07:14 +0000 (06:07 +0000)]
am
fab5c39a: (-s ours) am
75a77cc7: (-s ours) am
233f1b61: (-s ours) am
6540a972: (-s ours) am
2d546b77: (-s ours) Import translations. DO NOT MERGE
* commit '
fab5c39af678c5fb0142e6d5a0f23a046df96535':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 7 Aug 2015 05:02:05 +0000 (05:02 +0000)]
am
75a77cc7: (-s ours) am
233f1b61: (-s ours) am
6540a972: (-s ours) am
2d546b77: (-s ours) Import translations. DO NOT MERGE
* commit '
75a77cc77d30be0b8eb7b0e8dbd398ba1d8321cb':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 7 Aug 2015 04:55:25 +0000 (04:55 +0000)]
am
233f1b61: (-s ours) am
6540a972: (-s ours) am
2d546b77: (-s ours) Import translations. DO NOT MERGE
* commit '
233f1b61ce627819adb4351eb0b2d78f3020a38d':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 7 Aug 2015 04:48:08 +0000 (04:48 +0000)]
am
6540a972: (-s ours) am
2d546b77: (-s ours) Import translations. DO NOT MERGE
* commit '
6540a97291a5217558e67e5ed4186a25fbd16145':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 7 Aug 2015 04:44:05 +0000 (04:44 +0000)]
am
2d546b77: (-s ours) Import translations. DO NOT MERGE
* commit '
2d546b77b997376416e2ba22d5a01ef6da27cbb3':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 7 Aug 2015 04:20:12 +0000 (21:20 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22879473
Bug:
22719051
Change-Id: Ic6f0352135604d3a4d02ecfc9713f21191b046fd
Andres Morales [Thu, 6 Aug 2015 22:54:46 +0000 (22:54 +0000)]
am
23f40d37: am
ae560bf1: am
13d38763: am
d4c3dff6: am
4897fa87: Merge "fix CC for work profiles" into mnc-dev
* commit '
23f40d37fcfc3e7718ef40065a51360f5b4b2239':
fix CC for work profiles
Andres Morales [Thu, 6 Aug 2015 22:49:32 +0000 (22:49 +0000)]
am
ae560bf1: am
13d38763: am
d4c3dff6: am
4897fa87: Merge "fix CC for work profiles" into mnc-dev
* commit '
ae560bf189a7f738d67e87ed78579203b99a0066':
fix CC for work profiles
Andres Morales [Thu, 6 Aug 2015 22:41:42 +0000 (22:41 +0000)]
am
13d38763: am
d4c3dff6: am
4897fa87: Merge "fix CC for work profiles" into mnc-dev
* commit '
13d387631f586d03a77aace9da9a991d5aea32ba':
fix CC for work profiles
Andres Morales [Thu, 6 Aug 2015 22:36:04 +0000 (22:36 +0000)]
am
d4c3dff6: am
4897fa87: Merge "fix CC for work profiles" into mnc-dev
* commit '
d4c3dff6e3f900ab5693c9406ea625c2e398f7ba':
fix CC for work profiles
Andres Morales [Thu, 6 Aug 2015 22:30:55 +0000 (22:30 +0000)]
am
4897fa87: Merge "fix CC for work profiles" into mnc-dev
* commit '
4897fa87a55173f45bfddb2480a2e34eb412b8ef':
fix CC for work profiles
Andres Morales [Thu, 6 Aug 2015 22:22:17 +0000 (22:22 +0000)]
Merge "fix CC for work profiles" into mnc-dev
Julia Reynolds [Thu, 6 Aug 2015 14:54:44 +0000 (10:54 -0400)]
Hide optimization control on battery details page for non whitelisted apps.
Bug:
22978210
Change-Id: If532960478dccf6ef9bea08a27167e1850749277
Geoff Mendal [Thu, 6 Aug 2015 04:42:23 +0000 (04:42 +0000)]
am
8c35777f: (-s ours) am
79aed477: (-s ours) am
05facd93: (-s ours) am
18d86828: (-s ours) am
7930f872: (-s ours) Import translations. DO NOT MERGE
* commit '
8c35777f45f925bc3b2600807a15d74fa43c20f6':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:38:14 +0000 (04:38 +0000)]
am
79aed477: (-s ours) am
05facd93: (-s ours) am
18d86828: (-s ours) am
7930f872: (-s ours) Import translations. DO NOT MERGE
* commit '
79aed4774745113f5b110fcfd82a3ee64ff6ecc1':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:33:27 +0000 (04:33 +0000)]
am
a7a0e552: (-s ours) am
870ba029: (-s ours) am
40f6e9ab: (-s ours) am
90c22976: (-s ours) Import translations. DO NOT MERGE
* commit '
a7a0e5526b20caa3107dd2ff69ed00ddcaa52d5e':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:32:56 +0000 (04:32 +0000)]
am
05facd93: (-s ours) am
18d86828: (-s ours) am
7930f872: (-s ours) Import translations. DO NOT MERGE
* commit '
05facd935a44d882ca6f5e0ee7b3b1cffd1c0ad4':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:29:29 +0000 (04:29 +0000)]
am
870ba029: (-s ours) am
40f6e9ab: (-s ours) am
90c22976: (-s ours) Import translations. DO NOT MERGE
* commit '
870ba02933fa364660384944fa13ac0a94cab1b5':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:24:45 +0000 (04:24 +0000)]
am
18d86828: (-s ours) am
7930f872: (-s ours) Import translations. DO NOT MERGE
* commit '
18d8682802460074f4b0e628bae4d4051d542c77':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:24:30 +0000 (04:24 +0000)]
am
40f6e9ab: (-s ours) am
90c22976: (-s ours) Import translations. DO NOT MERGE
* commit '
40f6e9ab3ea41203d0ba1737713db58751e1995d':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:20:45 +0000 (04:20 +0000)]
am
90c22976: (-s ours) Import translations. DO NOT MERGE
* commit '
90c2297645341f347f56b160f06551963c64d039':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:20:33 +0000 (04:20 +0000)]
am
7930f872: (-s ours) Import translations. DO NOT MERGE
* commit '
7930f872ad6b3f0e27c41d848131204eac0cd705':
Import translations. DO NOT MERGE
Andres Morales [Tue, 4 Aug 2015 23:55:00 +0000 (16:55 -0700)]
fix CC for work profiles
Bug:
22257554
Change-Id: I09f62956d01f91d3014d9fa250aaff68ab5e1a9b
Geoff Mendal [Thu, 6 Aug 2015 01:24:49 +0000 (18:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22390723
Change-Id: I2098bcc385398b9e2ac2be40f18e98819d52dc7c
Geoff Mendal [Thu, 6 Aug 2015 01:15:07 +0000 (18:15 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22390723
Change-Id: Ifa5940a4053147c433ff717d920c6f724b53affa
Geoff Mendal [Thu, 6 Aug 2015 01:05:28 +0000 (18:05 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22390723
Change-Id: I313c60b172c8d6694f577f87ce01e889d4b6da16
Jason Monk [Wed, 5 Aug 2015 20:59:42 +0000 (20:59 +0000)]
am
cef52a74: am
854533a8: am
5b12cb77: am
150e60ca: am
888673bd: Hide show/hide system from battery optimizations list
* commit '
cef52a745a9ebb62f27fc6ecb8c24947b7916e4f':
Hide show/hide system from battery optimizations list
Jason Monk [Wed, 5 Aug 2015 20:52:19 +0000 (20:52 +0000)]
am
854533a8: am
5b12cb77: am
150e60ca: am
888673bd: Hide show/hide system from battery optimizations list
* commit '
854533a82d5cfeac27e80b610544291c5be4fa39':
Hide show/hide system from battery optimizations list
Sanket Padawe [Wed, 5 Aug 2015 20:44:51 +0000 (20:44 +0000)]
am
38e0c9fb: am
95a524a4: am
eb04b01b: am
ac02e250: am
151612fb: am
5f9d15ed: am
86d85300: am
19336da3: am
ac2347c0: am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
38e0c9fb5bdf120f6e8e2428bfbff2da048b4911':
Check for special char when renaming device for Wi-Fi direct.
Jason Monk [Wed, 5 Aug 2015 20:44:41 +0000 (20:44 +0000)]
am
5b12cb77: am
150e60ca: am
888673bd: Hide show/hide system from battery optimizations list
* commit '
5b12cb7712d85025c93ad941b0694916c0566a37':
Hide show/hide system from battery optimizations list
Jason Monk [Wed, 5 Aug 2015 20:37:17 +0000 (20:37 +0000)]
am
150e60ca: am
888673bd: Hide show/hide system from battery optimizations list
* commit '
150e60ca9ad594d36aa12b425836a7d61b68501c':
Hide show/hide system from battery optimizations list
Ajay Panicker [Wed, 5 Aug 2015 20:36:11 +0000 (20:36 +0000)]
am
21eff785: am
e396c224: am
f1ffec39: am
1dd985ab: am
cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
* commit '
21eff785a77c907724a9d44c06ff5c4c66204f3b':
Implement Bluetooth settings factory reset (5/5)
Sanket Padawe [Wed, 5 Aug 2015 20:33:11 +0000 (20:33 +0000)]
am
95a524a4: am
eb04b01b: am
ac02e250: am
151612fb: am
5f9d15ed: am
86d85300: am
19336da3: am
ac2347c0: am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
95a524a4ffd2da1873b9ac023f985afac4691b82':
Check for special char when renaming device for Wi-Fi direct.
Jason Monk [Wed, 5 Aug 2015 20:30:40 +0000 (20:30 +0000)]
am
888673bd: Hide show/hide system from battery optimizations list
* commit '
888673bd51acf9263163acfebdd0680358deabaa':
Hide show/hide system from battery optimizations list
Sanket Padawe [Wed, 5 Aug 2015 20:27:24 +0000 (20:27 +0000)]
am
eb04b01b: am
ac02e250: am
151612fb: am
5f9d15ed: am
86d85300: am
19336da3: am
ac2347c0: am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
eb04b01b3ffc44f6dec1a7d24228fcd4ab6116ee':
Check for special char when renaming device for Wi-Fi direct.
Sanket Padawe [Wed, 5 Aug 2015 20:20:47 +0000 (20:20 +0000)]
am
ac02e250: am
151612fb: am
5f9d15ed: am
86d85300: am
19336da3: am
ac2347c0: am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
ac02e250c1540c85c29e0ae753cb365c155c2968':
Check for special char when renaming device for Wi-Fi direct.
Sanket Padawe [Wed, 5 Aug 2015 20:12:00 +0000 (20:12 +0000)]
am
151612fb: am
5f9d15ed: am
86d85300: am
19336da3: am
ac2347c0: am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
151612fb0de35fd2fadb096511f108b433100149':
Check for special char when renaming device for Wi-Fi direct.
Jason Monk [Wed, 5 Aug 2015 20:06:19 +0000 (16:06 -0400)]
Hide show/hide system from battery optimizations list
Bug:
22977820
Change-Id: I1741bfe3e8703bae8ce10503879adfd12e9eb4fc
Sanket Padawe [Wed, 5 Aug 2015 20:07:15 +0000 (20:07 +0000)]
am
5f9d15ed: am
86d85300: am
19336da3: am
ac2347c0: am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
5f9d15ed252e0870097533bd75a759f28f2bda0d':
Check for special char when renaming device for Wi-Fi direct.
Ajay Panicker [Wed, 5 Aug 2015 18:43:17 +0000 (18:43 +0000)]
am
e396c224: am
f1ffec39: am
1dd985ab: am
cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
* commit '
e396c2241ff629bcfd60bd3caf3fe2da7637dee6':
Implement Bluetooth settings factory reset (5/5)
Sanket Padawe [Wed, 5 Aug 2015 18:28:12 +0000 (18:28 +0000)]
am
86d85300: am
19336da3: am
ac2347c0: am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
86d853000feca5a627ef87760cdd7df3c3aea1bb':
Check for special char when renaming device for Wi-Fi direct.
Ajay Panicker [Wed, 5 Aug 2015 18:26:05 +0000 (18:26 +0000)]
am
f1ffec39: am
1dd985ab: am
cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
* commit '
f1ffec39b64d85b361f7814690fd5eec0a176f51':
Implement Bluetooth settings factory reset (5/5)
Ajay Panicker [Wed, 5 Aug 2015 18:16:29 +0000 (18:16 +0000)]
am
1dd985ab: am
cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
* commit '
1dd985abdc5e2a04cf97b4dce778db89891e5064':
Implement Bluetooth settings factory reset (5/5)
Ajay Panicker [Wed, 5 Aug 2015 18:01:14 +0000 (18:01 +0000)]
am
cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
* commit '
cd8acb2256ca37ac4d1b71c513bac4e541c67c6d':
Implement Bluetooth settings factory reset (5/5)
Ajay Panicker [Wed, 5 Aug 2015 17:49:08 +0000 (17:49 +0000)]
Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
Jason Monk [Wed, 5 Aug 2015 17:32:41 +0000 (17:32 +0000)]
am
ca26f032: am
4734d829: am
6be055a8: am
c86f6dfd: am
244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
* commit '
ca26f0327c97cb799b4b1348b20424f6a5227d08':
Remove summaries fro configure apps page
Jason Monk [Wed, 5 Aug 2015 17:26:03 +0000 (17:26 +0000)]
am
4734d829: am
6be055a8: am
c86f6dfd: am
244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
* commit '
4734d829cd72acc70f24af88a3780c29d410af2d':
Remove summaries fro configure apps page
Jason Monk [Wed, 5 Aug 2015 17:09:10 +0000 (17:09 +0000)]
am
6be055a8: am
c86f6dfd: am
244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
* commit '
6be055a83dc6a70bbce04774b1725c8696abb1fa':
Remove summaries fro configure apps page
Jason Monk [Wed, 5 Aug 2015 17:01:02 +0000 (17:01 +0000)]
am
c86f6dfd: am
244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
* commit '
c86f6dfdc83d1c6c1115dccc9db9d8073587036d':
Remove summaries fro configure apps page
Jason Monk [Wed, 5 Aug 2015 16:48:13 +0000 (16:48 +0000)]
am
244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
* commit '
244fd78205827d6c77367c2a46dca661d85a6d98':
Remove summaries fro configure apps page
Geoff Mendal [Wed, 5 Aug 2015 14:50:18 +0000 (14:50 +0000)]
am
ea3f0326: (-s ours) am
ea1724e2: (-s ours) am
38911d7a: (-s ours) am
093f3746: (-s ours) Import translations. DO NOT MERGE
* commit '
ea3f0326b3043cf6672c9fbeb77c768b81a06e3d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 5 Aug 2015 14:44:44 +0000 (14:44 +0000)]
am
ea1724e2: (-s ours) am
38911d7a: (-s ours) am
093f3746: (-s ours) Import translations. DO NOT MERGE
* commit '
ea1724e2c1a94a061ee1b98fea79d88ae1ae2150':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 5 Aug 2015 14:38:27 +0000 (14:38 +0000)]
am
38911d7a: (-s ours) am
093f3746: (-s ours) Import translations. DO NOT MERGE
* commit '
38911d7a719483ab5f3a7ea18608774183229091':
Import translations. DO NOT MERGE
Jason Monk [Wed, 5 Aug 2015 14:34:14 +0000 (14:34 +0000)]
Merge "Remove summaries fro configure apps page" into mnc-dev
Geoff Mendal [Wed, 5 Aug 2015 14:30:37 +0000 (14:30 +0000)]
am
093f3746: (-s ours) Import translations. DO NOT MERGE
* commit '
093f37469ae513c273b5d1ab44793f1041888676':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 5 Aug 2015 14:05:39 +0000 (07:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib3414d2601d5e614e1a25823c238e8f124fc8e11
Auto-generated-cl: translation import
Geoff Mendal [Wed, 5 Aug 2015 13:14:46 +0000 (06:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8f44336535f1b0068d2d4da91070e965f400bfe7
Auto-generated-cl: translation import
Maurice Lam [Wed, 5 Aug 2015 01:20:41 +0000 (01:20 +0000)]
am
a69dc8ee: am
944233e2: am
5a079608: am
596a8a3c: am
311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
* commit '
a69dc8eea11e9097d7589f684e57e596135c87d4':
[Fingerprint] Update string for enrolling
Maurice Lam [Wed, 5 Aug 2015 01:11:25 +0000 (01:11 +0000)]
am
944233e2: am
5a079608: am
596a8a3c: am
311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
* commit '
944233e2521e3f92af92fe6af8c02780340724a7':
[Fingerprint] Update string for enrolling
Maurice Lam [Wed, 5 Aug 2015 01:05:42 +0000 (01:05 +0000)]
am
5a079608: am
596a8a3c: am
311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
* commit '
5a07960889ca3c393e682c9ca1bbc2dff276ef1d':
[Fingerprint] Update string for enrolling
Maurice Lam [Wed, 5 Aug 2015 00:56:58 +0000 (00:56 +0000)]
am
596a8a3c: am
311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
* commit '
596a8a3c0ac4e931c52e3f4b391d4d4dca1fdcf6':
[Fingerprint] Update string for enrolling
Maurice Lam [Wed, 5 Aug 2015 00:51:45 +0000 (00:51 +0000)]
am
c4ea9b29: am
c781bf30: am
e8f7ed9e: am
2a74b862: am
8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
* commit '
c4ea9b29c85837fdbe63a3089338137fd448d79d':
[Fingerprint] Shrink fingerprint progress ring
Maurice Lam [Wed, 5 Aug 2015 00:46:11 +0000 (00:46 +0000)]
am
311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
* commit '
311a2d952522eb61a513670a32462d22504401b1':
[Fingerprint] Update string for enrolling
Maurice Lam [Wed, 5 Aug 2015 00:44:00 +0000 (00:44 +0000)]
am
c781bf30: am
e8f7ed9e: am
2a74b862: am
8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
* commit '
c781bf30ad0a10217fa74dbb5a2f61ab165d8b3f':
[Fingerprint] Shrink fingerprint progress ring
Maurice Lam [Wed, 5 Aug 2015 00:38:37 +0000 (00:38 +0000)]
Merge "[Fingerprint] Update string for enrolling" into mnc-dev
Maurice Lam [Wed, 5 Aug 2015 00:35:27 +0000 (00:35 +0000)]
am
e8f7ed9e: am
2a74b862: am
8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
* commit '
e8f7ed9ea0ece56f58d5ea187ec00f01da54a2bf':
[Fingerprint] Shrink fingerprint progress ring
Maurice Lam [Wed, 5 Aug 2015 00:27:22 +0000 (00:27 +0000)]
am
2a74b862: am
8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
* commit '
2a74b8623816b961f3da7f45f080e61067f951e6':
[Fingerprint] Shrink fingerprint progress ring
Maurice Lam [Wed, 5 Aug 2015 00:20:06 +0000 (00:20 +0000)]
am
8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
* commit '
8c9136efceaec05663ac9f655e7e9c7cceb3ac2a':
[Fingerprint] Shrink fingerprint progress ring
Maurice Lam [Wed, 5 Aug 2015 00:09:32 +0000 (00:09 +0000)]
Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
Maurice Lam [Tue, 4 Aug 2015 23:56:34 +0000 (23:56 +0000)]
am
177cebf7: am
54a34ac6: am
6eb6f924: am
c48ea1f5: [Fingerprint] Update string for enrolling
* commit '
177cebf7e32632bb493fab0f157f7fe4827c0572':
[Fingerprint] Update string for enrolling
Maurice Lam [Tue, 4 Aug 2015 23:47:51 +0000 (23:47 +0000)]
am
54a34ac6: am
6eb6f924: am
c48ea1f5: [Fingerprint] Update string for enrolling
* commit '
54a34ac6f92577b95fb42ba9c55a230c68f80076':
[Fingerprint] Update string for enrolling
Maurice Lam [Tue, 4 Aug 2015 23:43:00 +0000 (23:43 +0000)]
am
6eb6f924: am
c48ea1f5: [Fingerprint] Update string for enrolling
* commit '
6eb6f924ac02afa004ea15ccbeecdd16c152b222':
[Fingerprint] Update string for enrolling
Maurice Lam [Tue, 4 Aug 2015 23:36:09 +0000 (23:36 +0000)]
am
c48ea1f5: [Fingerprint] Update string for enrolling
* commit '
c48ea1f5864b8f4d58eebd28173cff655193c70a':
[Fingerprint] Update string for enrolling
Maurice Lam [Tue, 4 Aug 2015 22:19:56 +0000 (15:19 -0700)]
[Fingerprint] Update string for enrolling
Update string for enrolling to tell the user to move their fingers,
so that different parts of their fingerprints can be captured.
Also include other minor update to strings mentioned in the bug.
Bug:
22719051
Change-Id: Idd3c69d4476d240c9ef81e8c82b7ae9fcb390a41
Maurice Lam [Tue, 4 Aug 2015 22:19:56 +0000 (15:19 -0700)]
[Fingerprint] Update string for enrolling
Update string for enrolling to tell the user to move their fingers,
so that different parts of their fingerprints can be captured.
Also include other minor update to strings mentioned in the bug.
Bug:
22719051
Change-Id: Idd3c69d4476d240c9ef81e8c82b7ae9fcb390a41
Billy Lau [Sat, 1 Aug 2015 17:12:33 +0000 (18:12 +0100)]
Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
Change the implementation of AppStateAppOpsBridge to handle multiple
requested permissions in one operation due to the merging of
CHANGE_NETWORK_STATE permission with WRITE_SETTINGS.
This change will affect the packages that will be listed under the
"Write system settings" option in Settings->Apps->[Gear/Cog].
Change-Id: I7d2304d2846b6f505a7b1c3fcf53e7a9bd184ed5
Ajay Panicker [Wed, 29 Jul 2015 18:39:16 +0000 (11:39 -0700)]
Implement Bluetooth settings factory reset (5/5)
Implemented the factory reset function to be used to reset all bluetooth
settings on device to factory default
Bug:
16161518
Change-Id: Ie5404a4547fcf747a0bb51d515e0c97628416f4b
Maurice Lam [Tue, 4 Aug 2015 22:05:23 +0000 (15:05 -0700)]
[Fingerprint] Shrink fingerprint progress ring
Make the fingerprint progress ring smaller so that the error message
can be seen on Nexus 5 during setup.
Bug:
22924280
Change-Id: Ic8a70e1fa6f2dd33d1c7c239e32d3eb3a92cc187
Jason Monk [Tue, 4 Aug 2015 21:10:14 +0000 (21:10 +0000)]
am
183fcd53: am
ddb22778: am
bd776a0b: am
9824c5da: resolved conflicts for merge of
1adca55f to mnc-dr-dev
* commit '
183fcd537023ef0e26cb6cd98d7cda48fdf12f20':
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
Jason Monk [Tue, 4 Aug 2015 21:03:38 +0000 (21:03 +0000)]
am
ddb22778: am
bd776a0b: am
9824c5da: resolved conflicts for merge of
1adca55f to mnc-dr-dev
* commit '
ddb22778100345a5a7bb00153e8e2f5b580c0d24':
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
Jason Monk [Tue, 4 Aug 2015 20:55:37 +0000 (20:55 +0000)]
am
bd776a0b: am
9824c5da: resolved conflicts for merge of
1adca55f to mnc-dr-dev
* commit '
bd776a0bb70b1956e3b7332fb75378df85b04a60':
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
OSDN Git Service
